[PR PATCH] cutter: fix build with qt5.15, switch to cmake, enable python

[PR PATCH] cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

There is a new 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: 3115 bytes --]

From ac09df85811c15717732507c91f04f6eaf1f892d 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

---
 srcpkgs/cutter/patches/qt5.15.patch | 49 +++++++++++++++++++++++++++++
 srcpkgs/cutter/template             |  6 ++--
 2 files changed, 53 insertions(+), 2 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..ad94e18dcc6 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -3,14 +3,16 @@ pkgname=cutter
 version=1.10.3
 revision=1
 build_wrksrc=src
-build_style=qmake
+build_style=cmake
+configure_args="-DCUTTER_ENABLE_PYTHON=ON"
 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"
+ qt5-location-devel qt5-svg-devel radare2 syntax-highlighting-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"

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-659650928

Comment:
Changing the build style is worth bumping revision.
Also, cmake installs a bunch of header files to `usr/include/cutter`, are they useful for anything?

Re: [PR PATCH] [Updated] cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- 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: 3426 bytes --]

From 1901e1bbe3a3af671e19a389b8d3ccb4671fddf9 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             | 17 ++++++----
 2 files changed, 60 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..e77a11558b1 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,21 @@
 # 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"
+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"
 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"
+}

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-659713513

Comment:
python plugin supports requires shiboken2-5.15 (@yopito)

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-659713513

Comment:
python plugin support requires shiboken2-5.15 (@yopito)

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-659713513

Comment:
python plugin support requires shiboken2-5.15 (@yopito, includes a soname bump)

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-659713513

Comment:
python plugin support requires shiboken2-5.15 (@yopito, includes a soname bump), #23607

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-659713513

Comment:
python plugin support requires shiboken2-5.15 (@yopito, includes a soname bump), ~#23607~ #23231

Re: [PR PATCH] [Updated] cutter: fix build with qt5.15, switch to cmake, enable python

[Piraty]

[-- 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"
+}

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-663764580

Comment:
I bumped cutter to 1.11.0, so the qt5 patch can be dropped.

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-748231492

Comment:
ping?

Re: [PR PATCH] [Closed]: cutter: fix build with qt5.15, switch to cmake, enable python

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

There's a closed pull request on the void-packages repository

cutter: fix build with qt5.15, switch to cmake, enable python
https://github.com/void-linux/void-packages/pull/23604

Description:
None

Re: cutter: fix build with qt5.15, switch to cmake, enable python

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/23604#issuecomment-1193187812

Comment:
Outdated, closing.