1 |
commit: 78b879409523e5095c8d5f0dc50c27054531c73a |
2 |
Author: Gergely Nagy <ngg <AT> ngg <DOT> hu> |
3 |
AuthorDate: Sun May 17 14:08:31 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 1 06:38:30 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b87940 |
7 |
|
8 |
dev-util/cutter: Bump to 1.10.3 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/721106 |
11 |
Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/15850 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
dev-util/cutter/Manifest | 1 + |
16 |
dev-util/cutter/cutter-1.10.3.ebuild | 56 ++++++++++++++++++++++ |
17 |
.../files/cutter-1.10.3-python3-config.patch | 36 ++++++++++++++ |
18 |
dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch | 36 ++++++++++++++ |
19 |
4 files changed, 129 insertions(+) |
20 |
|
21 |
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest |
22 |
index 7e10df6dd83..00da44cf69f 100644 |
23 |
--- a/dev-util/cutter/Manifest |
24 |
+++ b/dev-util/cutter/Manifest |
25 |
@@ -1,3 +1,4 @@ |
26 |
DIST cutter-1.10.1.tar.gz 1839344 BLAKE2B 883d0fa3d224d190b2dbec66e0bad1f2a542357bec9ce168706d60fa23794be23841157815323c989c1ddab9e1e428446e50ca0d71a91f7dbc8f01fe796caee2 SHA512 66f530687810a0bea3e4fcdf9962427964454a4a26e8d626d970bca358aab16b7939857fdbe22f0a611cdbdfbf67b5ab5f12959d8f04549c4cf8177cae49a54b |
27 |
+DIST cutter-1.10.3.tar.gz 1866223 BLAKE2B fe03da351b04511457ab9d5eaf1761a69237d125c7f835cb00f7c4eb5fd3cd3a2ca3dfafcd64757b115d68d14f0604f71da0ebf9993b839e89d1b55375df265f SHA512 8bee19ad5cc4304c52907247ac508bb10d1bf8251a0c75f96c01dbe918327f18ee0e76f831feca0c115134e08025fc9b79dc1d8e3e01925d4d2c960c8c67336d |
28 |
DIST cutter-1.8.2.tar.gz 1527164 BLAKE2B 49ad9d208d77332c87acb2ed389d854ed8866bd561e89582266effd448bd3f1260f2e8d91ebc2fcbb7beb40aec39e460bc7a327021a4339db157af5a809cbc19 SHA512 16cb6a158882f17435e4c146b021a7ddb61a331efcb53e5a29e3598f399e71b59003473fa5a07cc0769148e67b02dbf955051bbb5ceb4df69b4cf1805b85f4cc |
29 |
DIST cutter-1.9.0.tar.gz 1548575 BLAKE2B 810b6d9f3b203f79711e38b26b60f545fd65f96e5b7d7638538c074ab7dbe83104d79b11f6b552d16e4a30236c5965ed377ad7d9c71cb8fce0a1d9d13076cd54 SHA512 f9b68469320e0e54562612cba21632f69dfe1e0bb1f21d05d7f0a083208e11f2e1a0ab338f8db43fb324aa8538b6f93d566eda13283d5b96ab1127c2d846b388 |
30 |
|
31 |
diff --git a/dev-util/cutter/cutter-1.10.3.ebuild b/dev-util/cutter/cutter-1.10.3.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..6fea7b83cb0 |
34 |
--- /dev/null |
35 |
+++ b/dev-util/cutter/cutter-1.10.3.ebuild |
36 |
@@ -0,0 +1,56 @@ |
37 |
+# Copyright 1999-2020 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=7 |
41 |
+ |
42 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
43 |
+ |
44 |
+inherit qmake-utils xdg-utils python-single-r1 |
45 |
+ |
46 |
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework" |
47 |
+HOMEPAGE="https://www.radare.org" |
48 |
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
49 |
+ |
50 |
+LICENSE="GPL-3" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~amd64 ~x86" |
53 |
+IUSE="" |
54 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
55 |
+ |
56 |
+DEPEND=" |
57 |
+ ${PYTHON_DEPS} |
58 |
+ dev-qt/qtcore:5 |
59 |
+ dev-qt/qtgui:5 |
60 |
+ dev-qt/qtnetwork:5 |
61 |
+ dev-qt/qtsvg:5 |
62 |
+ dev-qt/qtwidgets:5 |
63 |
+ >=dev-util/radare2-4.4.0 |
64 |
+" |
65 |
+ |
66 |
+RDEPEND="${DEPEND}" |
67 |
+ |
68 |
+PATCHES=( |
69 |
+ "${FILESDIR}/${PN}-1.10.3-python3-config.patch" |
70 |
+ "${FILESDIR}/${P}-qt-5.15.patch" # https://github.com/radareorg/cutter/pull/2231 |
71 |
+) |
72 |
+ |
73 |
+src_configure() { |
74 |
+ local myqmakeargs=( |
75 |
+ CUTTER_ENABLE_PYTHON=true |
76 |
+ PREFIX=\'${EPREFIX}/usr\' |
77 |
+ ) |
78 |
+ |
79 |
+ eqmake5 "${myqmakeargs[@]}" src |
80 |
+} |
81 |
+ |
82 |
+src_install() { |
83 |
+ emake INSTALL_ROOT="${D}" install |
84 |
+} |
85 |
+ |
86 |
+pkg_postinst() { |
87 |
+ xdg_icon_cache_update |
88 |
+} |
89 |
+ |
90 |
+pkg_postrm() { |
91 |
+ xdg_icon_cache_update |
92 |
+} |
93 |
|
94 |
diff --git a/dev-util/cutter/files/cutter-1.10.3-python3-config.patch b/dev-util/cutter/files/cutter-1.10.3-python3-config.patch |
95 |
new file mode 100644 |
96 |
index 00000000000..f024ba26df0 |
97 |
--- /dev/null |
98 |
+++ b/dev-util/cutter/files/cutter-1.10.3-python3-config.patch |
99 |
@@ -0,0 +1,36 @@ |
100 |
+diff --git a/src/Cutter.pro b/src/Cutter.pro |
101 |
+index 5ea3a78..d99b4a5 100644 |
102 |
+--- a/src/Cutter.pro |
103 |
++++ b/src/Cutter.pro |
104 |
+@@ -115,10 +115,6 @@ unix { |
105 |
+ # Libraries |
106 |
+ include(lib_radare2.pri) |
107 |
+ |
108 |
+-!win32 { |
109 |
+- CONFIG += link_pkgconfig |
110 |
+-} |
111 |
+- |
112 |
+ CUTTER_ENABLE_PYTHON { |
113 |
+ win32 { |
114 |
+ PYTHON_EXECUTABLE = $$system("where python", lines) |
115 |
+@@ -135,10 +131,17 @@ CUTTER_ENABLE_PYTHON { |
116 |
+ LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python |
117 |
+ DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED |
118 |
+ } else { |
119 |
+- !packagesExist(python3) { |
120 |
+- error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.") |
121 |
++ system(type python3-config) { |
122 |
++ TMP = $$system(python3-config --libs --embed, true, TMPSTATUS) |
123 |
++ !equals(TMPSTATUS, 0) { |
124 |
++ TMP = $$system(python3-config --libs) |
125 |
++ } |
126 |
++ LIBS += $$TMP |
127 |
++ TMP = $$system(python3-config --includes) |
128 |
++ INCLUDEPATH += $$replace(TMP, "-I", "") |
129 |
++ } else { |
130 |
++ error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.") |
131 |
+ } |
132 |
+- PKGCONFIG += python3 |
133 |
+ } |
134 |
+ } |
135 |
+ |
136 |
|
137 |
diff --git a/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch b/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch |
138 |
new file mode 100644 |
139 |
index 00000000000..0ce08dd798a |
140 |
--- /dev/null |
141 |
+++ b/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch |
142 |
@@ -0,0 +1,36 @@ |
143 |
+diff --git a/src/widgets/ColorPicker.cpp b/src/widgets/ColorPicker.cpp |
144 |
+index 25df2e3ac..fd9ce0875 100644 |
145 |
+--- a/src/widgets/ColorPicker.cpp |
146 |
++++ b/src/widgets/ColorPicker.cpp |
147 |
+@@ -3,6 +3,7 @@ |
148 |
+ |
149 |
+ #include <QPaintEvent> |
150 |
+ #include <QPainter> |
151 |
++#include <QPainterPath> |
152 |
+ #include <QMouseEvent> |
153 |
+ #include <QDesktopWidget> |
154 |
+ #include <QPixmap> |
155 |
+diff --git a/src/widgets/ColorThemeListView.cpp b/src/widgets/ColorThemeListView.cpp |
156 |
+index d79b7eb51..6013fa4da 100644 |
157 |
+--- a/src/widgets/ColorThemeListView.cpp |
158 |
++++ b/src/widgets/ColorThemeListView.cpp |
159 |
+@@ -3,6 +3,7 @@ |
160 |
+ #include <QJsonArray> |
161 |
+ #include <QMap> |
162 |
+ #include <QPainter> |
163 |
++#include <QPainterPath> |
164 |
+ #include <QFontMetrics> |
165 |
+ #include <QScreen> |
166 |
+ #include <QJsonArray> |
167 |
+diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp |
168 |
+index 34c1efbe7..25e917e96 100644 |
169 |
+--- a/src/widgets/DisassemblyWidget.cpp |
170 |
++++ b/src/widgets/DisassemblyWidget.cpp |
171 |
+@@ -14,6 +14,7 @@ |
172 |
+ #include <QRegularExpression> |
173 |
+ #include <QTextBlockUserData> |
174 |
+ #include <QPainter> |
175 |
++#include <QPainterPath> |
176 |
+ #include <QSplitter> |
177 |
+ |
178 |
+ |