[gentoo-commits] repo/gentoo:master commit in: dev-util/cutter/files/, dev-util/cutter/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     78b879409523e5095c8d5f0dc50c27054531c73a
Author:     Gergely Nagy <ngg <AT> ngg <DOT> hu>
AuthorDate: Sun May 17 14:08:31 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 06:38:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b87940

dev-util/cutter: Bump to 1.10.3

Closes: https://bugs.gentoo.org/721106
Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu>
Closes: https://github.com/gentoo/gentoo/pull/15850
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/cutter/Manifest                           |  1 +
 dev-util/cutter/cutter-1.10.3.ebuild               | 56 ++++++++++++++++++++++
 .../files/cutter-1.10.3-python3-config.patch       | 36 ++++++++++++++
 dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch  | 36 ++++++++++++++
 4 files changed, 129 insertions(+)

diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 7e10df6dd83..00da44cf69f 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,3 +1,4 @@
 DIST cutter-1.10.1.tar.gz 1839344 BLAKE2B 883d0fa3d224d190b2dbec66e0bad1f2a542357bec9ce168706d60fa23794be23841157815323c989c1ddab9e1e428446e50ca0d71a91f7dbc8f01fe796caee2 SHA512 66f530687810a0bea3e4fcdf9962427964454a4a26e8d626d970bca358aab16b7939857fdbe22f0a611cdbdfbf67b5ab5f12959d8f04549c4cf8177cae49a54b
+DIST cutter-1.10.3.tar.gz 1866223 BLAKE2B fe03da351b04511457ab9d5eaf1761a69237d125c7f835cb00f7c4eb5fd3cd3a2ca3dfafcd64757b115d68d14f0604f71da0ebf9993b839e89d1b55375df265f SHA512 8bee19ad5cc4304c52907247ac508bb10d1bf8251a0c75f96c01dbe918327f18ee0e76f831feca0c115134e08025fc9b79dc1d8e3e01925d4d2c960c8c67336d
 DIST cutter-1.8.2.tar.gz 1527164 BLAKE2B 49ad9d208d77332c87acb2ed389d854ed8866bd561e89582266effd448bd3f1260f2e8d91ebc2fcbb7beb40aec39e460bc7a327021a4339db157af5a809cbc19 SHA512 16cb6a158882f17435e4c146b021a7ddb61a331efcb53e5a29e3598f399e71b59003473fa5a07cc0769148e67b02dbf955051bbb5ceb4df69b4cf1805b85f4cc
 DIST cutter-1.9.0.tar.gz 1548575 BLAKE2B 810b6d9f3b203f79711e38b26b60f545fd65f96e5b7d7638538c074ab7dbe83104d79b11f6b552d16e4a30236c5965ed377ad7d9c71cb8fce0a1d9d13076cd54 SHA512 f9b68469320e0e54562612cba21632f69dfe1e0bb1f21d05d7f0a083208e11f2e1a0ab338f8db43fb324aa8538b6f93d566eda13283d5b96ab1127c2d846b388

diff --git a/dev-util/cutter/cutter-1.10.3.ebuild b/dev-util/cutter/cutter-1.10.3.ebuild
new file mode 100644
index 00000000000..6fea7b83cb0
--- /dev/null
+++ b/dev-util/cutter/cutter-1.10.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit qmake-utils xdg-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=dev-util/radare2-4.4.0
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.3-python3-config.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch" # https://github.com/radareorg/cutter/pull/2231
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_PYTHON=true
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}

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
new file mode 100644
index 00000000000..f024ba26df0
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.10.3-python3-config.patch
@@ -0,0 +1,36 @@
+diff --git a/src/Cutter.pro b/src/Cutter.pro
+index 5ea3a78..d99b4a5 100644
+--- a/src/Cutter.pro
++++ b/src/Cutter.pro
+@@ -115,10 +115,6 @@ unix {
+ # Libraries
+ include(lib_radare2.pri)
+ 
+-!win32 {
+-    CONFIG += link_pkgconfig
+-}
+-
+ CUTTER_ENABLE_PYTHON {
+     win32 {
+         PYTHON_EXECUTABLE = $$system("where python", lines)
+@@ -135,10 +131,17 @@ CUTTER_ENABLE_PYTHON {
+             LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
+             DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
+         } else {
+-            !packagesExist(python3) {
+-                error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
++            system(type python3-config) {
++                TMP = $$system(python3-config --libs --embed, true, TMPSTATUS)
++                !equals(TMPSTATUS, 0) {
++                    TMP = $$system(python3-config --libs)
++                }
++                LIBS += $$TMP
++                TMP = $$system(python3-config --includes)
++                INCLUDEPATH += $$replace(TMP, "-I", "")
++            } else {
++                error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
+             }
+-            PKGCONFIG += python3
+         }
+     }
+ 

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
new file mode 100644
index 00000000000..0ce08dd798a
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch
@@ -0,0 +1,36 @@
+diff --git a/src/widgets/ColorPicker.cpp b/src/widgets/ColorPicker.cpp
+index 25df2e3ac..fd9ce0875 100644
+--- a/src/widgets/ColorPicker.cpp
++++ b/src/widgets/ColorPicker.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QDesktopWidget>
+ #include <QPixmap>
+diff --git a/src/widgets/ColorThemeListView.cpp b/src/widgets/ColorThemeListView.cpp
+index d79b7eb51..6013fa4da 100644
+--- a/src/widgets/ColorThemeListView.cpp
++++ b/src/widgets/ColorThemeListView.cpp
+@@ -3,6 +3,7 @@
+ #include <QJsonArray>
+ #include <QMap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFontMetrics>
+ #include <QScreen>
+ #include <QJsonArray>
+diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
+index 34c1efbe7..25e917e96 100644
+--- a/src/widgets/DisassemblyWidget.cpp
++++ b/src/widgets/DisassemblyWidget.cpp
+@@ -14,6 +14,7 @@
+ #include <QRegularExpression>
+ #include <QTextBlockUserData>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSplitter>
+ 
+