From ac09df85811c15717732507c91f04f6eaf1f892d Mon Sep 17 00:00:00 2001 From: Piraty 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 +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 + #include ++#include + #include + #include + #include +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 + #include + #include ++#include + #include + #include + #include +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 + #include + #include ++#include + #include + + 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 " 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"