Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cutter: fix build with qt5.15, switch to cmake, enable python
@ 2020-07-16 18:54 Piraty
  2020-07-16 20:22 ` jnbr
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Piraty @ 2020-07-16 18:54 UTC (permalink / raw)
  To: ml

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

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-07-23 21:00 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-16 18:54 [PR PATCH] cutter: fix build with qt5.15, switch to cmake, enable python 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 ` [PR PATCH] [Updated] " Piraty
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

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).