From 85997926a31265ba61d31d8bfb6370e3fae356f9 Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Tue, 1 Mar 2022 08:49:12 +0100 Subject: [PATCH] cutter: update to 2.0.5. --- .../cutter/patches/ksyntaxhighlighting.patch | 43 +++++++++++++++++++ srcpkgs/cutter/template | 29 ++++++++----- 2 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/cutter/patches/ksyntaxhighlighting.patch diff --git a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch new file mode 100644 index 000000000000..461a3dec9d58 --- /dev/null +++ b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch @@ -0,0 +1,43 @@ +diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp +index 3c309e83..47019165 100644 +--- a/src/common/Configuration.cpp ++++ b/src/common/Configuration.cpp +@@ -7,9 +7,9 @@ + #include + + #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING +-# include +-# include +-# include ++# include ++# include ++# include + #endif + + #include "common/ColorThemeWorker.h" +diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp +index 64a2038e..eebb59f9 100644 +--- a/src/common/SyntaxHighlighter.cpp ++++ b/src/common/SyntaxHighlighter.cpp +@@ -5,7 +5,7 @@ + + # include "Configuration.h" + +-# include ++# include + + SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document) + : KSyntaxHighlighting::SyntaxHighlighter(document) +diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h +index b9e88970..a21b4ec2 100644 +--- a/src/common/SyntaxHighlighter.h ++++ b/src/common/SyntaxHighlighter.h +@@ -10,7 +10,7 @@ + + #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING + +-# include ++# include + + class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter + { diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index 7142c048f53c..174e9b25796e 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,16 +1,25 @@ # Template file for 'cutter' pkgname=cutter -version=1.12.0 -revision=2 -build_wrksrc=src -build_style=qmake -configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins" -hostmakedepends="pkg-config qt5-qmake qt5-host-tools radare2" +version=2.0.5 +revision=1 +wrksrc=$pkgname +build_style=cmake +configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins + CUTTER_ENABLE_PYTHON=y CUTTER_ENABLE_PYTHON_BINDINGS=y + CUTTER_ENABLE_GRAPHVIZ=y CUTTER_ENABLE_KSYNTAXHIGHLIGHTING=y" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools radare2 meson git" makedepends="capstone-devel python3-devel qt5-declarative-devel - qt5-location-devel qt5-svg-devel radare2" + qt5-location-devel qt5-svg-devel radare2 graphviz-devel + libshiboken2-devel libpyside2-python3-devel qt5-declarative-devel + syntax-highlighting-devel" short_desc="GUI for radare2 written in C++ and QT" maintainer="Orphaned " license="GPL-3.0-only" -homepage="https://github.com/radareorg/cutter" -distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz" -checksum=868213d2ea0b4a29b9b03c9b605c2b2155c4c03b62735a9bd376a0dadcb4fe1b +homepage="https://cutter.re" + +do_fetch() { + git clone --recurse-submodules https://github.com/rizinorg/cutter + cd cutter + git checkout "v${version}" + git submodule update --init --recursive +}