From eeb705b9fa3fc5edd8ce62a5b46ee2f0dd459eb9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 28 Aug 2022 06:26:11 -0400 Subject: [PATCH 1/4] rizin: update to 0.4.0. --- common/shlibs | 50 ++++++++++++++++++++++-------------------- srcpkgs/rizin/template | 7 +++--- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/common/shlibs b/common/shlibs index 48c63f2d0735..39f593f2454b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4124,30 +4124,32 @@ mod_spatialite.so.7 libspatialite-5.0.1_1 libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1 libyascreen.so.0 yascreen-1.86_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 +librz_analysis.so.0.4 rizin-0.4.0_1 +librz_asm.so.0.4 rizin-0.4.0_1 +librz_bin.so.0.4 rizin-0.4.0_1 +librz_bp.so.0.4 rizin-0.4.0_1 +librz_config.so.0.4 rizin-0.4.0_1 +librz_cons.so.0.4 rizin-0.4.0_1 +librz_core.so.0.4 rizin-0.4.0_1 +librz_crypto.so.0.4 rizin-0.4.0_1 +librz_debug.so.0.4 rizin-0.4.0_1 +librz_demangler.so.0.4 rizin-0.4.0_1 +librz_diff.so.0.4 rizin-0.4.0_1 +librz_egg.so.0.4 rizin-0.4.0_1 +librz_flag.so.0.4 rizin-0.4.0_1 +librz_hash.so.0.4 rizin-0.4.0_1 +librz_io.so.0.4 rizin-0.4.0_1 +librz_lang.so.0.4 rizin-0.4.0_1 +librz_magic.so.0.4 rizin-0.4.0_1 +librz_main.so.0.4 rizin-0.4.0_1 +librz_parse.so.0.4 rizin-0.4.0_1 +librz_reg.so.0.4 rizin-0.4.0_1 +librz_search.so.0.4 rizin-0.4.0_1 +librz_sign.so.0.4 rizin-0.4.0_1 +librz_socket.so.0.4 rizin-0.4.0_1 +librz_syscall.so.0.4 rizin-0.4.0_1 +librz_type.so.0.4 rizin-0.4.0_1 +librz_util.so.0.4 rizin-0.4.0_1 libaravis-0.8.so.0 libaravis-0.8.21_1 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1 libnvme.so.1 libnvme-1.0_1 diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template index 40c2dffeb9ae..52d37cf47c88 100644 --- a/srcpkgs/rizin/template +++ b/srcpkgs/rizin/template @@ -1,13 +1,13 @@ # Template file for 'rizin' pkgname=rizin -version=0.3.4 +version=0.4.0 revision=1 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" + -D use_sys_tree_sitter=enabled -D use_libuv=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" @@ -16,7 +16,7 @@ maintainer="Urs Schulz " 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 +checksum=09eba8684fe813cf42a716b59a86d3d65afce013d7e8b275e145e849d3366b5a rizin-devel_package() { @@ -26,5 +26,6 @@ rizin-devel_package() { vmove "usr/lib/*.so" vmove usr/include/librz vmove usr/lib/pkgconfig + vmove usr/lib/cmake } } From 2d3e854e8d0b0c46ada2b9b34868ae5bd45b7488 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 28 Aug 2022 08:58:19 -0400 Subject: [PATCH 2/4] rizin: update to 0.4.0. --- srcpkgs/rizin/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template index 52d37cf47c88..8c2e0711086d 100644 --- a/srcpkgs/rizin/template +++ b/srcpkgs/rizin/template @@ -17,6 +17,8 @@ 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=09eba8684fe813cf42a716b59a86d3d65afce013d7e8b275e145e849d3366b5a +# requires some external files, not clear where they come from +make_check=no rizin-devel_package() { From 9c8b9d78606dd1ecd57c3d14ea0773c7a8a56fdb Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 28 Aug 2022 06:27:02 -0400 Subject: [PATCH 3/4] cutter: update to 2.1.0. --- srcpkgs/cutter-devel | 1 + .../cutter/patches/ksyntaxhighlighting.patch | 43 ------------------- srcpkgs/cutter/template | 22 +++++++--- 3 files changed, 16 insertions(+), 50 deletions(-) create mode 120000 srcpkgs/cutter-devel delete mode 100644 srcpkgs/cutter/patches/ksyntaxhighlighting.patch diff --git a/srcpkgs/cutter-devel b/srcpkgs/cutter-devel new file mode 120000 index 000000000000..834ab3347b6f --- /dev/null +++ b/srcpkgs/cutter-devel @@ -0,0 +1 @@ +cutter \ No newline at end of file diff --git a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch deleted file mode 100644 index 461a3dec9d58..000000000000 --- a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 a2d6ca506827..315eba89099d 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,10 +1,10 @@ # Template file for 'cutter' pkgname=cutter -version=2.0.5 +version=2.1.0 revision=1 -_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236" +_translations_commit="67f5c654523d22c7843811e5aa852a01742f6f12" build_style=cmake -configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins +configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/cutter/plugins/native -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 @@ -17,13 +17,21 @@ short_desc="GUI for radare2 written in C++ and QT" maintainer="Urs Schulz " license="GPL-3.0-only" homepage="https://cutter.re" -distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz +distfiles="https://github.com/rizinorg/cutter/archive/refs/tags/v${version}.tar.gz https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz" -checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab - 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069" - +checksum="60aacead1604c2dc8afad4239732ad10d5882ab38828e695c0f53d1e134c2a5c + 12a06a7f977cf7c6d28e1d466cb9e421edb2d26c36e838d02292e5e45bc326c5" post_extract() { rmdir src/translations mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations" } + +cutter-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + } +} From 47e280fd5323198012a34d2dd3ec7c427ac50a11 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 28 Aug 2022 06:27:23 -0400 Subject: [PATCH 4/4] New package: rz-ghidra-0.4.0 --- srcpkgs/rz-ghidra/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/rz-ghidra/template diff --git a/srcpkgs/rz-ghidra/template b/srcpkgs/rz-ghidra/template new file mode 100644 index 000000000000..27382852ff28 --- /dev/null +++ b/srcpkgs/rz-ghidra/template @@ -0,0 +1,16 @@ +# Template file for 'rz-ghidra' +pkgname=rz-ghidra +version=0.4.0 +revision=1 +wrksrc="$pkgname" +build_style=cmake +configure_args="-DCUTTER_INSTALL_PLUGDIR=/usr/lib/rizin/cutter/plugins/native + -DBUILD_CUTTER_PLUGIN=ON" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake" +makedepends="cutter-devel rizin-devel" +short_desc="Deep ghidra decompiler and sleigh disassembler integration for rizin" +maintainer="classabbyamp " +license="LGPL-3.0-or-later" +homepage="https://github.com/rizinorg/rz-ghidra" +distfiles="https://github.com/rizinorg/rz-ghidra/releases/download/v${version}/rz-ghidra-src-v${version}.tar.gz" +checksum=6b8a6d1259699115e70f1f7d27de26c57fc19338d2d3e517460e35bb5f39eb55