From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] cutter: fix build with qt5.15, switch to cmake, enable python
Date: Fri, 17 Jul 2020 16:24:01 +0200 [thread overview]
Message-ID: <20200717142401.JaW5itnES-6rLSEergFn-5tjE2-wrAxCbwguFBKaGCg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23604@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages cutter-cmake-python
https://github.com/void-linux/void-packages/pull/23604
cutter: fix build with qt5.15, switch to cmake, enable python
A patch file from https://github.com/void-linux/void-packages/pull/23604.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-cmake-python-23604.patch --]
[-- Type: text/x-diff, Size: 3508 bytes --]
From f91ec34a385fe9426ca798df1eee4c35703f15c0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 16 Jul 2020 20:43:44 +0200
Subject: [PATCH] cutter: fix build with qt5.15
* switch to cmake
* enable python
* enable graphviz
---
srcpkgs/cutter/patches/qt5.15.patch | 49 +++++++++++++++++++++++++++++
srcpkgs/cutter/template | 18 +++++++----
2 files changed, 61 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/cutter/patches/qt5.15.patch
diff --git a/srcpkgs/cutter/patches/qt5.15.patch b/srcpkgs/cutter/patches/qt5.15.patch
new file mode 100644
index 00000000000..e73d61e30e6
--- /dev/null
+++ b/srcpkgs/cutter/patches/qt5.15.patch
@@ -0,0 +1,49 @@
+upstream: yes
+
+From 56c2e3741afdab11b4f52d91192b83f2876fea82 Mon Sep 17 00:00:00 2001
+From: bartoszek <bartoszek.github@bartus.33mail.com>
+Date: Thu, 4 Jun 2020 05:51:03 +0200
+Subject: [PATCH] Fix qt>5.15 build (#2231)
+
+---
+ src/widgets/ColorPicker.cpp | 1 +
+ src/widgets/ColorThemeListView.cpp | 1 +
+ src/widgets/DisassemblyWidget.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+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>
+
+
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 8093ccc6a08..62282f179b4 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,22 @@
# Template file for 'cutter'
pkgname=cutter
version=1.10.3
-revision=1
+revision=2
build_wrksrc=src
-build_style=qmake
-hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel
- qt5-svg-devel qt5-tools-devel radare2"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+build_style=cmake
+configure_args="-DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=ON"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake radare2"
+makedepends="capstone-devel graphviz-devel python3-devel qt5-declarative-devel
+ qt5-location-devel qt5-svg-devel radare2 syntax-highlighting-devel
+ libshiboken2-devel libpyside2-python3-devel"
short_desc="GUI for radare2 written in C++ and QT"
maintainer="johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-only"
homepage="https://github.com/radareorg/cutter"
distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz"
checksum=2ece3c7ce31fb7b5e4f3a2926cf8c59c97ca84ae8c526d593d896fddd085f981
+patch_args="-Np1"
+
+post_install() {
+ rm -rf "${XBPS_DESTDIR}/usr/include" "${XBPS_DESTDIR}/lib/Cutter/*.cmake"
+}
next prev parent reply other threads:[~2020-07-17 14:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 18:54 [PR PATCH] " Piraty
2020-07-16 20:22 ` jnbr
2020-07-16 22:23 ` [PR PATCH] [Updated] " Piraty
2020-07-16 22:38 ` Piraty
2020-07-16 22:38 ` Piraty
2020-07-16 22:38 ` Piraty
2020-07-16 22:49 ` Piraty
2020-07-17 8:01 ` Piraty
2020-07-17 14:24 ` Piraty [this message]
2020-07-24 22:54 ` jnbr
2020-12-18 17:56 ` ericonr
2022-07-23 21:00 ` jnbr
2022-07-23 21:00 ` [PR PATCH] [Closed]: " jnbr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200717142401.JaW5itnES-6rLSEergFn-5tjE2-wrAxCbwguFBKaGCg@z \
--to=piraty@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).