Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cutter: update to 2.0.5.
@ 2022-03-01  7:53 faulesocke
  2022-03-02  8:54 ` [PR PATCH] [Updated] WIP: " faulesocke
                   ` (31 more replies)
  0 siblings, 32 replies; 33+ messages in thread
From: faulesocke @ 2022-03-01  7:53 UTC (permalink / raw)
  To: ml

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

There is a new pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 3687 bytes --]

From 85997926a31265ba61d31d8bfb6370e3fae356f9 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ 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 <orphan@voidlinux.org>"
 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
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] WIP: cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
@ 2022-03-02  8:54 ` faulesocke
  2022-03-02  8:55 ` faulesocke
                   ` (30 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02  8:54 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

WIP: cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 7533 bytes --]

From 8d0d285662618807a6f0b324b500a9cc15c369e0 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 09:51:40 +0100
Subject: [PATCH 1/2] New package: rizin-0.3.4

---
 common/shlibs          | 24 ++++++++++++++++++++++++
 srcpkgs/rizin-devel    |  1 +
 srcpkgs/rizin/template | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 120000 srcpkgs/rizin-devel
 create mode 100644 srcpkgs/rizin/template

diff --git a/common/shlibs b/common/shlibs
index 8f171c85d99b..059676598bce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4115,3 +4115,27 @@ libjvm.so openjdk17-jre-17.0.1+12_1
 librttopo.so.1 librttopo-1.1.0_1
 libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
+librz_bp.so.0.3.4 rizin-0.3.4_1
+librz_reg.so.0.3.4 rizin-0.3.4_1
+librz_debug.so.0.3.4 rizin-0.3.4_1
+librz_hash.so.0.3.4 rizin-0.3.4_1
+librz_config.so.0.3.4 rizin-0.3.4_1
+librz_parse.so.0.3.4 rizin-0.3.4_1
+librz_asm.so.0.3.4 rizin-0.3.4_1
+librz_type.so.0.3.4 rizin-0.3.4_1
+librz_socket.so.0.3.4 rizin-0.3.4_1
+librz_egg.so.0.3.4 rizin-0.3.4_1
+librz_core.so.0.3.4 rizin-0.3.4_1
+librz_diff.so.0.3.4 rizin-0.3.4_1
+librz_main.so.0.3.4 rizin-0.3.4_1
+librz_cons.so.0.3.4 rizin-0.3.4_1
+librz_crypto.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.3.4 rizin-0.3.4_1
+librz_syscall.so.0.3.4 rizin-0.3.4_1
+librz_io.so.0.3.4 rizin-0.3.4_1
+librz_flag.so.0.3.4 rizin-0.3.4_1
+librz_magic.so.0.3.4 rizin-0.3.4_1
+librz_util.so.0.3.4 rizin-0.3.4_1
+librz_lang.so.0.3.4 rizin-0.3.4_1
+librz_search.so.0.3.4 rizin-0.3.4_1
+librz_bin.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/rizin-devel b/srcpkgs/rizin-devel
new file mode 120000
index 000000000000..1d00f71ce25b
--- /dev/null
+++ b/srcpkgs/rizin-devel
@@ -0,0 +1 @@
+rizin
\ No newline at end of file
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
new file mode 100644
index 000000000000..91987b43c849
--- /dev/null
+++ b/srcpkgs/rizin/template
@@ -0,0 +1,38 @@
+# Template file for 'rizin'
+pkgname=rizin
+version=0.3.4
+revision=1
+archs="i686 x86_64"
+wrksrc="${pkgname}-v${version}"
+#create_wrksrc=yes
+build_style=meson
+configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
+ -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
+ -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="pkg-config"
+makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
+ tree-sitter-devel file-devel openssl-devel"
+depends=""
+short_desc="UNIX-like reverse engineering framework and command-line toolset"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="LGPL-3.0-only"
+homepage="https://github.com/rizinorg/rizin"
+distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
+checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+
+subpackages="rizin-devel"
+
+
+rizin-devel_package() {
+    depends="${makedepends} rizin>=${version}_${revision}"
+    short_desc="${short_desc} - development files"
+    pkg_install() {
+        vmove usr/include/librz
+        vmove usr/lib/pkgconfig
+    }
+}

From 62466794e14f1d3a7319222878bbcddee281bd8f Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH 2/2] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 38 ++++++++++------
 2 files changed, 69 insertions(+), 12 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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..7dafe1f62d91 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # 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"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+
+do_fetch() {
+	if [ ! -e "$wrksrc" ]; then
+		git clone --recurse-submodules "https://github.com/rizinorg/${pkgname}" $wrksrc
+	fi
+	cd $wrksrc
+	git checkout "v${version}"
+	git submodule update --init --recursive
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] WIP: cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
  2022-03-02  8:54 ` [PR PATCH] [Updated] WIP: " faulesocke
@ 2022-03-02  8:55 ` faulesocke
  2022-03-02  8:58 ` [PR PATCH] [Updated] " faulesocke
                   ` (29 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02  8:55 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

WIP: cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 7538 bytes --]

From 4e5e6aee3a8740911a132f0044b098f0705ebae0 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 09:51:40 +0100
Subject: [PATCH 1/2] New package: rizin-0.3.4

---
 common/shlibs          | 24 ++++++++++++++++++++++++
 srcpkgs/rizin-devel    |  1 +
 srcpkgs/rizin/template | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 120000 srcpkgs/rizin-devel
 create mode 100644 srcpkgs/rizin/template

diff --git a/common/shlibs b/common/shlibs
index 5096ab5dad6b..eb49f6ff4c3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4117,3 +4117,27 @@ libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
 libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
+librz_bp.so.0.3.4 rizin-0.3.4_1
+librz_reg.so.0.3.4 rizin-0.3.4_1
+librz_debug.so.0.3.4 rizin-0.3.4_1
+librz_hash.so.0.3.4 rizin-0.3.4_1
+librz_config.so.0.3.4 rizin-0.3.4_1
+librz_parse.so.0.3.4 rizin-0.3.4_1
+librz_asm.so.0.3.4 rizin-0.3.4_1
+librz_type.so.0.3.4 rizin-0.3.4_1
+librz_socket.so.0.3.4 rizin-0.3.4_1
+librz_egg.so.0.3.4 rizin-0.3.4_1
+librz_core.so.0.3.4 rizin-0.3.4_1
+librz_diff.so.0.3.4 rizin-0.3.4_1
+librz_main.so.0.3.4 rizin-0.3.4_1
+librz_cons.so.0.3.4 rizin-0.3.4_1
+librz_crypto.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.3.4 rizin-0.3.4_1
+librz_syscall.so.0.3.4 rizin-0.3.4_1
+librz_io.so.0.3.4 rizin-0.3.4_1
+librz_flag.so.0.3.4 rizin-0.3.4_1
+librz_magic.so.0.3.4 rizin-0.3.4_1
+librz_util.so.0.3.4 rizin-0.3.4_1
+librz_lang.so.0.3.4 rizin-0.3.4_1
+librz_search.so.0.3.4 rizin-0.3.4_1
+librz_bin.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/rizin-devel b/srcpkgs/rizin-devel
new file mode 120000
index 000000000000..1d00f71ce25b
--- /dev/null
+++ b/srcpkgs/rizin-devel
@@ -0,0 +1 @@
+rizin
\ No newline at end of file
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
new file mode 100644
index 000000000000..91987b43c849
--- /dev/null
+++ b/srcpkgs/rizin/template
@@ -0,0 +1,38 @@
+# Template file for 'rizin'
+pkgname=rizin
+version=0.3.4
+revision=1
+archs="i686 x86_64"
+wrksrc="${pkgname}-v${version}"
+#create_wrksrc=yes
+build_style=meson
+configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
+ -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
+ -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="pkg-config"
+makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
+ tree-sitter-devel file-devel openssl-devel"
+depends=""
+short_desc="UNIX-like reverse engineering framework and command-line toolset"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="LGPL-3.0-only"
+homepage="https://github.com/rizinorg/rizin"
+distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
+checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+
+subpackages="rizin-devel"
+
+
+rizin-devel_package() {
+    depends="${makedepends} rizin>=${version}_${revision}"
+    short_desc="${short_desc} - development files"
+    pkg_install() {
+        vmove usr/include/librz
+        vmove usr/lib/pkgconfig
+    }
+}

From c109e2e23f2dc36310194296c901fd1e686ca6b3 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH 2/2] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 38 ++++++++++------
 2 files changed, 69 insertions(+), 12 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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..7dafe1f62d91 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # 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"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+
+do_fetch() {
+	if [ ! -e "$wrksrc" ]; then
+		git clone --recurse-submodules "https://github.com/rizinorg/${pkgname}" $wrksrc
+	fi
+	cd $wrksrc
+	git checkout "v${version}"
+	git submodule update --init --recursive
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
  2022-03-02  8:54 ` [PR PATCH] [Updated] WIP: " faulesocke
  2022-03-02  8:55 ` faulesocke
@ 2022-03-02  8:58 ` faulesocke
  2022-03-02  9:12 ` [PR REVIEW] " paper42
                   ` (28 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02  8:58 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 7374 bytes --]

From 9cbf5d1f3434955239ee714df9ef00ae07a6d8f0 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 09:51:40 +0100
Subject: [PATCH 1/2] New package: rizin-0.3.4

---
 common/shlibs          | 24 ++++++++++++++++++++++++
 srcpkgs/rizin-devel    |  1 +
 srcpkgs/rizin/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/rizin-devel
 create mode 100644 srcpkgs/rizin/template

diff --git a/common/shlibs b/common/shlibs
index 5096ab5dad6b..eb49f6ff4c3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4117,3 +4117,27 @@ libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
 libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
+librz_bp.so.0.3.4 rizin-0.3.4_1
+librz_reg.so.0.3.4 rizin-0.3.4_1
+librz_debug.so.0.3.4 rizin-0.3.4_1
+librz_hash.so.0.3.4 rizin-0.3.4_1
+librz_config.so.0.3.4 rizin-0.3.4_1
+librz_parse.so.0.3.4 rizin-0.3.4_1
+librz_asm.so.0.3.4 rizin-0.3.4_1
+librz_type.so.0.3.4 rizin-0.3.4_1
+librz_socket.so.0.3.4 rizin-0.3.4_1
+librz_egg.so.0.3.4 rizin-0.3.4_1
+librz_core.so.0.3.4 rizin-0.3.4_1
+librz_diff.so.0.3.4 rizin-0.3.4_1
+librz_main.so.0.3.4 rizin-0.3.4_1
+librz_cons.so.0.3.4 rizin-0.3.4_1
+librz_crypto.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.3.4 rizin-0.3.4_1
+librz_syscall.so.0.3.4 rizin-0.3.4_1
+librz_io.so.0.3.4 rizin-0.3.4_1
+librz_flag.so.0.3.4 rizin-0.3.4_1
+librz_magic.so.0.3.4 rizin-0.3.4_1
+librz_util.so.0.3.4 rizin-0.3.4_1
+librz_lang.so.0.3.4 rizin-0.3.4_1
+librz_search.so.0.3.4 rizin-0.3.4_1
+librz_bin.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/rizin-devel b/srcpkgs/rizin-devel
new file mode 120000
index 000000000000..1d00f71ce25b
--- /dev/null
+++ b/srcpkgs/rizin-devel
@@ -0,0 +1 @@
+rizin
\ No newline at end of file
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
new file mode 100644
index 000000000000..e887b1e9912f
--- /dev/null
+++ b/srcpkgs/rizin/template
@@ -0,0 +1,32 @@
+# Template file for 'rizin'
+pkgname=rizin
+version=0.3.4
+revision=1
+archs="i686 x86_64"
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
+ -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
+ -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+hostmakedepends="pkg-config"
+makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
+ tree-sitter-devel file-devel openssl-devel"
+short_desc="UNIX-like reverse engineering framework and command-line toolset"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="LGPL-3.0-only"
+homepage="https://github.com/rizinorg/rizin"
+distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
+checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+
+subpackages="rizin-devel"
+
+
+rizin-devel_package() {
+	depends="${makedepends} rizin>=${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include/librz
+		vmove usr/lib/pkgconfig
+	}
+}

From 0faf2dc642787b9ec93f3a949faefc1836aa4596 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH 2/2] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 38 ++++++++++------
 2 files changed, 69 insertions(+), 12 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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..7dafe1f62d91 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # 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"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+
+do_fetch() {
+	if [ ! -e "$wrksrc" ]; then
+		git clone --recurse-submodules "https://github.com/rizinorg/${pkgname}" $wrksrc
+	fi
+	cd $wrksrc
+	git checkout "v${version}"
+	git submodule update --init --recursive
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (2 preceding siblings ...)
  2022-03-02  8:58 ` [PR PATCH] [Updated] " faulesocke
@ 2022-03-02  9:12 ` paper42
  2022-03-02  9:13 ` paper42
                   ` (27 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02  9:12 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817488269

Comment:
why?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (3 preceding siblings ...)
  2022-03-02  9:12 ` [PR REVIEW] " paper42
@ 2022-03-02  9:13 ` paper42
  2022-03-02 10:26 ` faulesocke
                   ` (26 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02  9:13 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817489365

Comment:
This is very ugly, can we just use release tarballs?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (4 preceding siblings ...)
  2022-03-02  9:13 ` paper42
@ 2022-03-02 10:26 ` faulesocke
  2022-03-02 10:31 ` faulesocke
                   ` (25 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 10:26 UTC (permalink / raw)
  To: ml

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

New review comment by faulesocke on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817553958

Comment:
They don't offer release source tarballs. I've several other packages in my pipeline with the same issue. Looks like package maintainers don't know (or don't care) that github does not include submodules into automatically generated tarballs. Probably because of things like flatpack. But other distributions don't seem to care as well: They just fetch the source from github directly, like I did.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (5 preceding siblings ...)
  2022-03-02 10:26 ` faulesocke
@ 2022-03-02 10:31 ` faulesocke
  2022-03-02 10:33 ` faulesocke
                   ` (24 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 10:31 UTC (permalink / raw)
  To: ml

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

New review comment by faulesocke on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817557532

Comment:
Does not build for arm.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (6 preceding siblings ...)
  2022-03-02 10:31 ` faulesocke
@ 2022-03-02 10:33 ` faulesocke
  2022-03-02 10:38 ` [PR REVIEW] " faulesocke
                   ` (23 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 10:33 UTC (permalink / raw)
  To: ml

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

New comment by faulesocke on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#issuecomment-1056769394

Comment:
What can I do to skip the `do_check` in the pipeline?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (7 preceding siblings ...)
  2022-03-02 10:33 ` faulesocke
@ 2022-03-02 10:38 ` faulesocke
  2022-03-02 11:03 ` paper42
                   ` (22 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 10:38 UTC (permalink / raw)
  To: ml

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

New review comment by faulesocke on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817563487

Comment:
There is an issue for this which is unanswered since ~2 months: https://github.com/rizinorg/cutter/issues/2878

I guess they have more important stuff to do and we have to go with the "ugly" solution.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (10 preceding siblings ...)
  2022-03-02 11:03 ` paper42
@ 2022-03-02 11:03 ` paper42
  2022-03-02 11:03 ` paper42
                   ` (19 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:03 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817582601

Comment:
That's unfortunate, but could you do something similar to #32199?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (8 preceding siblings ...)
  2022-03-02 10:38 ` [PR REVIEW] " faulesocke
@ 2022-03-02 11:03 ` paper42
  2022-03-02 11:03 ` paper42
                   ` (21 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:03 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817571283

Comment:
```suggestion
	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (11 preceding siblings ...)
  2022-03-02 11:03 ` paper42
@ 2022-03-02 11:03 ` paper42
  2022-03-02 11:03 ` paper42
                   ` (18 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:03 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817566988

Comment:
```suggestion
```
This is not required

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (9 preceding siblings ...)
  2022-03-02 11:03 ` paper42
@ 2022-03-02 11:03 ` paper42
  2022-03-02 11:03 ` paper42
                   ` (20 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:03 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817568663

Comment:
```suggestion
		vmove usr/include
		vmove "usr/lib/*.so"
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (12 preceding siblings ...)
  2022-03-02 11:03 ` paper42
@ 2022-03-02 11:03 ` paper42
  2022-03-02 11:03 ` paper42
                   ` (17 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:03 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817571283

Comment:
```suggestion
	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (13 preceding siblings ...)
  2022-03-02 11:03 ` paper42
@ 2022-03-02 11:03 ` paper42
  2022-03-02 11:04 ` paper42
                   ` (16 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:03 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817568663

Comment:
```suggestion
		vmove usr/include
		vmove "usr/lib/*.so"
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (14 preceding siblings ...)
  2022-03-02 11:03 ` paper42
@ 2022-03-02 11:04 ` paper42
  2022-03-02 11:05 ` paper42
                   ` (15 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:04 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817566988

Comment:
```suggestion
```
This is not required

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (15 preceding siblings ...)
  2022-03-02 11:04 ` paper42
@ 2022-03-02 11:05 ` paper42
  2022-03-02 11:06 ` paper42
                   ` (14 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:05 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817583978

Comment:
Is this documented upstream? What's the error? Does it build for -musl?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (17 preceding siblings ...)
  2022-03-02 11:06 ` paper42
@ 2022-03-02 11:06 ` paper42
  2022-03-02 11:06 ` paper42
                   ` (12 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:06 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817584622

Comment:
```suggestion
	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (16 preceding siblings ...)
  2022-03-02 11:05 ` paper42
@ 2022-03-02 11:06 ` paper42
  2022-03-02 11:06 ` paper42
                   ` (13 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:06 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817584988

Comment:
```suggestion
	pkg_install() {
		vmove "usr/lib/*.so"
		vmove usr/include/librz
		vmove usr/lib/pkgconfig
	}
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (18 preceding siblings ...)
  2022-03-02 11:06 ` paper42
@ 2022-03-02 11:06 ` paper42
  2022-03-02 11:47 ` faulesocke
                   ` (11 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:06 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817584506

Comment:
this is not required

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (19 preceding siblings ...)
  2022-03-02 11:06 ` paper42
@ 2022-03-02 11:47 ` faulesocke
  2022-03-02 11:50 ` paper42
                   ` (10 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 11:47 UTC (permalink / raw)
  To: ml

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

New review comment by faulesocke on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817615078

Comment:
I haven't checked the error and haven't checked musl, this is just what I've seen from a previous pipeline run. I don't have time for fiddling around with these architectures. When someone needs it on musl or arm he can still make a PR to fix it.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (20 preceding siblings ...)
  2022-03-02 11:47 ` faulesocke
@ 2022-03-02 11:50 ` paper42
  2022-03-02 12:00 ` [PR PATCH] [Updated] " faulesocke
                   ` (9 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 11:50 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817616635

Comment:
It's not acceptable to just disable a package for some architectures without a good reason. Remove these arch restrictions from both packages so we can see where it fails.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (21 preceding siblings ...)
  2022-03-02 11:50 ` paper42
@ 2022-03-02 12:00 ` faulesocke
  2022-03-02 12:01 ` [PR REVIEW] " faulesocke
                   ` (8 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 12:00 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 7482 bytes --]

From ea8a35a105537ec1caa82ed655f0d71ff804a01b Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 09:51:40 +0100
Subject: [PATCH 1/2] New package: rizin-0.3.4

---
 common/shlibs          | 24 ++++++++++++++++++++++++
 srcpkgs/rizin-devel    |  1 +
 srcpkgs/rizin/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/rizin-devel
 create mode 100644 srcpkgs/rizin/template

diff --git a/common/shlibs b/common/shlibs
index 5096ab5dad6b..eb49f6ff4c3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4117,3 +4117,27 @@ libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
 libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
+librz_bp.so.0.3.4 rizin-0.3.4_1
+librz_reg.so.0.3.4 rizin-0.3.4_1
+librz_debug.so.0.3.4 rizin-0.3.4_1
+librz_hash.so.0.3.4 rizin-0.3.4_1
+librz_config.so.0.3.4 rizin-0.3.4_1
+librz_parse.so.0.3.4 rizin-0.3.4_1
+librz_asm.so.0.3.4 rizin-0.3.4_1
+librz_type.so.0.3.4 rizin-0.3.4_1
+librz_socket.so.0.3.4 rizin-0.3.4_1
+librz_egg.so.0.3.4 rizin-0.3.4_1
+librz_core.so.0.3.4 rizin-0.3.4_1
+librz_diff.so.0.3.4 rizin-0.3.4_1
+librz_main.so.0.3.4 rizin-0.3.4_1
+librz_cons.so.0.3.4 rizin-0.3.4_1
+librz_crypto.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.3.4 rizin-0.3.4_1
+librz_syscall.so.0.3.4 rizin-0.3.4_1
+librz_io.so.0.3.4 rizin-0.3.4_1
+librz_flag.so.0.3.4 rizin-0.3.4_1
+librz_magic.so.0.3.4 rizin-0.3.4_1
+librz_util.so.0.3.4 rizin-0.3.4_1
+librz_lang.so.0.3.4 rizin-0.3.4_1
+librz_search.so.0.3.4 rizin-0.3.4_1
+librz_bin.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/rizin-devel b/srcpkgs/rizin-devel
new file mode 120000
index 000000000000..1d00f71ce25b
--- /dev/null
+++ b/srcpkgs/rizin-devel
@@ -0,0 +1 @@
+rizin
\ No newline at end of file
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
new file mode 100644
index 000000000000..b471ce1bfb61
--- /dev/null
+++ b/srcpkgs/rizin/template
@@ -0,0 +1,30 @@
+# Template file for 'rizin'
+pkgname=rizin
+version=0.3.4
+revision=1
+archs="i686 x86_64"
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
+ -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
+ -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+hostmakedepends="pkg-config"
+makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
+ tree-sitter-devel file-devel openssl-devel"
+short_desc="UNIX-like reverse engineering framework and command-line toolset"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="LGPL-3.0-only"
+homepage="https://github.com/rizinorg/rizin"
+distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
+checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+
+
+rizin-devel_package() {
+	depends="${makedepends} rizin>=${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include/librz
+		vmove usr/lib/pkgconfig
+	}
+}

From 2d8ae568da186c32f4f3ab9877e482f0a6813edd Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH 2/2] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 38 ++++++++++------
 2 files changed, 69 insertions(+), 12 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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..0ba35058db70 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # 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"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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"
+_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz
+ https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz"
+checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+ 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069"
+
+
+post_extract() {
+	rmdir src/translations
+	mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations"
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (22 preceding siblings ...)
  2022-03-02 12:00 ` [PR PATCH] [Updated] " faulesocke
@ 2022-03-02 12:01 ` faulesocke
  2022-03-02 12:05 ` paper42
                   ` (7 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 12:01 UTC (permalink / raw)
  To: ml

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

New review comment by faulesocke on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817624990

Comment:
The `.so` files definitely DO NOT go into the `-devel` package.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (23 preceding siblings ...)
  2022-03-02 12:01 ` [PR REVIEW] " faulesocke
@ 2022-03-02 12:05 ` paper42
  2022-03-02 12:08 ` [PR PATCH] [Updated] " faulesocke
                   ` (6 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 12:05 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817627669

Comment:
They are just symlinks to .so.$version, we don't need them in the main package, we only need the real versioned libraries.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (24 preceding siblings ...)
  2022-03-02 12:05 ` paper42
@ 2022-03-02 12:08 ` faulesocke
  2022-03-02 12:15 ` faulesocke
                   ` (5 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 12:08 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 7489 bytes --]

From ed59f62dbc134e94d21c525299e8871bad61fee3 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 09:51:40 +0100
Subject: [PATCH 1/2] New package: rizin-0.3.4

---
 common/shlibs          | 24 ++++++++++++++++++++++++
 srcpkgs/rizin-devel    |  1 +
 srcpkgs/rizin/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/rizin-devel
 create mode 100644 srcpkgs/rizin/template

diff --git a/common/shlibs b/common/shlibs
index 5096ab5dad6b..eb49f6ff4c3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4117,3 +4117,27 @@ libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
 libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
+librz_bp.so.0.3.4 rizin-0.3.4_1
+librz_reg.so.0.3.4 rizin-0.3.4_1
+librz_debug.so.0.3.4 rizin-0.3.4_1
+librz_hash.so.0.3.4 rizin-0.3.4_1
+librz_config.so.0.3.4 rizin-0.3.4_1
+librz_parse.so.0.3.4 rizin-0.3.4_1
+librz_asm.so.0.3.4 rizin-0.3.4_1
+librz_type.so.0.3.4 rizin-0.3.4_1
+librz_socket.so.0.3.4 rizin-0.3.4_1
+librz_egg.so.0.3.4 rizin-0.3.4_1
+librz_core.so.0.3.4 rizin-0.3.4_1
+librz_diff.so.0.3.4 rizin-0.3.4_1
+librz_main.so.0.3.4 rizin-0.3.4_1
+librz_cons.so.0.3.4 rizin-0.3.4_1
+librz_crypto.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.3.4 rizin-0.3.4_1
+librz_syscall.so.0.3.4 rizin-0.3.4_1
+librz_io.so.0.3.4 rizin-0.3.4_1
+librz_flag.so.0.3.4 rizin-0.3.4_1
+librz_magic.so.0.3.4 rizin-0.3.4_1
+librz_util.so.0.3.4 rizin-0.3.4_1
+librz_lang.so.0.3.4 rizin-0.3.4_1
+librz_search.so.0.3.4 rizin-0.3.4_1
+librz_bin.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/rizin-devel b/srcpkgs/rizin-devel
new file mode 120000
index 000000000000..1d00f71ce25b
--- /dev/null
+++ b/srcpkgs/rizin-devel
@@ -0,0 +1 @@
+rizin
\ No newline at end of file
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
new file mode 100644
index 000000000000..7b5694f38f25
--- /dev/null
+++ b/srcpkgs/rizin/template
@@ -0,0 +1,30 @@
+# Template file for 'rizin'
+pkgname=rizin
+version=0.3.4
+revision=1
+archs="i686 x86_64"
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
+ -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
+ -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+hostmakedepends="pkg-config"
+makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
+ tree-sitter-devel file-devel openssl-devel"
+short_desc="UNIX-like reverse engineering framework and command-line toolset"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="LGPL-3.0-only"
+homepage="https://github.com/rizinorg/rizin"
+distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
+checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+
+
+rizin-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include/librz
+		vmove usr/lib/pkgconfig
+	}
+}

From d27c1ebc212c67ec2886c8c2254aeed2c6cc24b8 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH 2/2] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 38 ++++++++++------
 2 files changed, 69 insertions(+), 12 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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..0ba35058db70 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # 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"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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"
+_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz
+ https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz"
+checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+ 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069"
+
+
+post_extract() {
+	rmdir src/translations
+	mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations"
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (25 preceding siblings ...)
  2022-03-02 12:08 ` [PR PATCH] [Updated] " faulesocke
@ 2022-03-02 12:15 ` faulesocke
  2022-03-02 12:25 ` faulesocke
                   ` (4 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 12:15 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 7514 bytes --]

From ee0351b3d27c909a9fff60f55b4f2e799eed984d Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 09:51:40 +0100
Subject: [PATCH 1/2] New package: rizin-0.3.4

---
 common/shlibs          | 24 ++++++++++++++++++++++++
 srcpkgs/rizin-devel    |  1 +
 srcpkgs/rizin/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/rizin-devel
 create mode 100644 srcpkgs/rizin/template

diff --git a/common/shlibs b/common/shlibs
index 5096ab5dad6b..eb49f6ff4c3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4117,3 +4117,27 @@ libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
 libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
+librz_bp.so.0.3.4 rizin-0.3.4_1
+librz_reg.so.0.3.4 rizin-0.3.4_1
+librz_debug.so.0.3.4 rizin-0.3.4_1
+librz_hash.so.0.3.4 rizin-0.3.4_1
+librz_config.so.0.3.4 rizin-0.3.4_1
+librz_parse.so.0.3.4 rizin-0.3.4_1
+librz_asm.so.0.3.4 rizin-0.3.4_1
+librz_type.so.0.3.4 rizin-0.3.4_1
+librz_socket.so.0.3.4 rizin-0.3.4_1
+librz_egg.so.0.3.4 rizin-0.3.4_1
+librz_core.so.0.3.4 rizin-0.3.4_1
+librz_diff.so.0.3.4 rizin-0.3.4_1
+librz_main.so.0.3.4 rizin-0.3.4_1
+librz_cons.so.0.3.4 rizin-0.3.4_1
+librz_crypto.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.3.4 rizin-0.3.4_1
+librz_syscall.so.0.3.4 rizin-0.3.4_1
+librz_io.so.0.3.4 rizin-0.3.4_1
+librz_flag.so.0.3.4 rizin-0.3.4_1
+librz_magic.so.0.3.4 rizin-0.3.4_1
+librz_util.so.0.3.4 rizin-0.3.4_1
+librz_lang.so.0.3.4 rizin-0.3.4_1
+librz_search.so.0.3.4 rizin-0.3.4_1
+librz_bin.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/rizin-devel b/srcpkgs/rizin-devel
new file mode 120000
index 000000000000..1d00f71ce25b
--- /dev/null
+++ b/srcpkgs/rizin-devel
@@ -0,0 +1 @@
+rizin
\ No newline at end of file
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
new file mode 100644
index 000000000000..4977ff86d6ef
--- /dev/null
+++ b/srcpkgs/rizin/template
@@ -0,0 +1,31 @@
+# Template file for 'rizin'
+pkgname=rizin
+version=0.3.4
+revision=1
+archs="i686 x86_64"
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
+ -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
+ -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+hostmakedepends="pkg-config"
+makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
+ tree-sitter-devel file-devel openssl-devel"
+short_desc="UNIX-like reverse engineering framework and command-line toolset"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="LGPL-3.0-only"
+homepage="https://github.com/rizinorg/rizin"
+distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
+checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+
+
+rizin-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include/librz
+		vmove usr/lib/pkgconfig
+	}
+}

From 3cb26ef4523ce61c1de0fb0a15636b38686b7b1d Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH 2/2] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 38 ++++++++++------
 2 files changed, 69 insertions(+), 12 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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..0ba35058db70 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # 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"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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"
+_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz
+ https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz"
+checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+ 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069"
+
+
+post_extract() {
+	rmdir src/translations
+	mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations"
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (26 preceding siblings ...)
  2022-03-02 12:15 ` faulesocke
@ 2022-03-02 12:25 ` faulesocke
  2022-03-02 12:29 ` [PR REVIEW] " faulesocke
                   ` (3 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 12:25 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 8141 bytes --]

From ee0351b3d27c909a9fff60f55b4f2e799eed984d Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 09:51:40 +0100
Subject: [PATCH 1/3] New package: rizin-0.3.4

---
 common/shlibs          | 24 ++++++++++++++++++++++++
 srcpkgs/rizin-devel    |  1 +
 srcpkgs/rizin/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/rizin-devel
 create mode 100644 srcpkgs/rizin/template

diff --git a/common/shlibs b/common/shlibs
index 5096ab5dad6b..eb49f6ff4c3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4117,3 +4117,27 @@ libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
 libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
+librz_bp.so.0.3.4 rizin-0.3.4_1
+librz_reg.so.0.3.4 rizin-0.3.4_1
+librz_debug.so.0.3.4 rizin-0.3.4_1
+librz_hash.so.0.3.4 rizin-0.3.4_1
+librz_config.so.0.3.4 rizin-0.3.4_1
+librz_parse.so.0.3.4 rizin-0.3.4_1
+librz_asm.so.0.3.4 rizin-0.3.4_1
+librz_type.so.0.3.4 rizin-0.3.4_1
+librz_socket.so.0.3.4 rizin-0.3.4_1
+librz_egg.so.0.3.4 rizin-0.3.4_1
+librz_core.so.0.3.4 rizin-0.3.4_1
+librz_diff.so.0.3.4 rizin-0.3.4_1
+librz_main.so.0.3.4 rizin-0.3.4_1
+librz_cons.so.0.3.4 rizin-0.3.4_1
+librz_crypto.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.3.4 rizin-0.3.4_1
+librz_syscall.so.0.3.4 rizin-0.3.4_1
+librz_io.so.0.3.4 rizin-0.3.4_1
+librz_flag.so.0.3.4 rizin-0.3.4_1
+librz_magic.so.0.3.4 rizin-0.3.4_1
+librz_util.so.0.3.4 rizin-0.3.4_1
+librz_lang.so.0.3.4 rizin-0.3.4_1
+librz_search.so.0.3.4 rizin-0.3.4_1
+librz_bin.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/rizin-devel b/srcpkgs/rizin-devel
new file mode 120000
index 000000000000..1d00f71ce25b
--- /dev/null
+++ b/srcpkgs/rizin-devel
@@ -0,0 +1 @@
+rizin
\ No newline at end of file
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
new file mode 100644
index 000000000000..4977ff86d6ef
--- /dev/null
+++ b/srcpkgs/rizin/template
@@ -0,0 +1,31 @@
+# Template file for 'rizin'
+pkgname=rizin
+version=0.3.4
+revision=1
+archs="i686 x86_64"
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
+ -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
+ -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+hostmakedepends="pkg-config"
+makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
+ tree-sitter-devel file-devel openssl-devel"
+short_desc="UNIX-like reverse engineering framework and command-line toolset"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="LGPL-3.0-only"
+homepage="https://github.com/rizinorg/rizin"
+distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
+checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+
+
+rizin-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include/librz
+		vmove usr/lib/pkgconfig
+	}
+}

From 3cb26ef4523ce61c1de0fb0a15636b38686b7b1d Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH 2/3] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 38 ++++++++++------
 2 files changed, 69 insertions(+), 12 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 <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #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 <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ 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 <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..0ba35058db70 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,30 @@
 # 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"
-makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+version=2.0.5
+revision=1
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+ -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
+ -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+ -DCUTTER_ENABLE_CRASH_REPORTS=OFF"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools meson git"
+makedepends="capstone-devel python3-devel qt5-declarative-devel qt5-location-devel
+ qt5-svg-devel graphviz-devel libshiboken2-devel libpyside2-python3-devel
+ syntax-highlighting-devel rizin-devel"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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"
+_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236"
+distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz
+ https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz"
+checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
+ 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069"
+
+
+post_extract() {
+	rmdir src/translations
+	mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations"
+}

From c41eab43e74e3e87161583f8786b268da8ee043b Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 2 Mar 2022 13:24:56 +0100
Subject: [PATCH 3/3] rizin: build for all archs

---
 srcpkgs/rizin/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
index 4977ff86d6ef..40c2dffeb9ae 100644
--- a/srcpkgs/rizin/template
+++ b/srcpkgs/rizin/template
@@ -2,7 +2,6 @@
 pkgname=rizin
 version=0.3.4
 revision=1
-archs="i686 x86_64"
 wrksrc="${pkgname}-v${version}"
 build_style=meson
 configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (27 preceding siblings ...)
  2022-03-02 12:25 ` faulesocke
@ 2022-03-02 12:29 ` faulesocke
  2022-03-02 13:08 ` paper42
                   ` (2 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: faulesocke @ 2022-03-02 12:29 UTC (permalink / raw)
  To: ml

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

New review comment by faulesocke on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817644666

Comment:
`tree-sitter` has `nocross=yes`. So it won't compile to arm.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (28 preceding siblings ...)
  2022-03-02 12:29 ` [PR REVIEW] " faulesocke
@ 2022-03-02 13:08 ` paper42
  2022-03-02 13:08 ` paper42
  2022-03-04 23:55 ` [PR PATCH] [Merged]: " Johnnynator
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 13:08 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817672314

Comment:
put this next to $version

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (29 preceding siblings ...)
  2022-03-02 13:08 ` paper42
@ 2022-03-02 13:08 ` paper42
  2022-03-04 23:55 ` [PR PATCH] [Merged]: " Johnnynator
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-03-02 13:08 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35901#discussion_r817673624

Comment:
But `tree-sitter` can still be compiled natively on arm. In that case we should set nocross=yes instead of restricting archs, but #35922 should fix cross compilation of tree-sitter, so this line can be dropped.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Merged]: cutter: update to 2.0.5.
  2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
                   ` (30 preceding siblings ...)
  2022-03-02 13:08 ` paper42
@ 2022-03-04 23:55 ` Johnnynator
  31 siblings, 0 replies; 33+ messages in thread
From: Johnnynator @ 2022-03-04 23:55 UTC (permalink / raw)
  To: ml

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

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

cutter: update to 2.0.5.
https://github.com/void-linux/void-packages/pull/35901

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2022-03-04 23:55 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
2022-03-02  8:54 ` [PR PATCH] [Updated] WIP: " faulesocke
2022-03-02  8:55 ` faulesocke
2022-03-02  8:58 ` [PR PATCH] [Updated] " faulesocke
2022-03-02  9:12 ` [PR REVIEW] " paper42
2022-03-02  9:13 ` paper42
2022-03-02 10:26 ` faulesocke
2022-03-02 10:31 ` faulesocke
2022-03-02 10:33 ` faulesocke
2022-03-02 10:38 ` [PR REVIEW] " faulesocke
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:04 ` paper42
2022-03-02 11:05 ` paper42
2022-03-02 11:06 ` paper42
2022-03-02 11:06 ` paper42
2022-03-02 11:06 ` paper42
2022-03-02 11:47 ` faulesocke
2022-03-02 11:50 ` paper42
2022-03-02 12:00 ` [PR PATCH] [Updated] " faulesocke
2022-03-02 12:01 ` [PR REVIEW] " faulesocke
2022-03-02 12:05 ` paper42
2022-03-02 12:08 ` [PR PATCH] [Updated] " faulesocke
2022-03-02 12:15 ` faulesocke
2022-03-02 12:25 ` faulesocke
2022-03-02 12:29 ` [PR REVIEW] " faulesocke
2022-03-02 13:08 ` paper42
2022-03-02 13:08 ` paper42
2022-03-04 23:55 ` [PR PATCH] [Merged]: " Johnnynator

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