From 32e2c104504f7898d49eebcb3b2910325329736d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 22 Nov 2021 22:27:58 +0100 Subject: [PATCH 1/3] cutter: update to 2.0.3. --- srcpkgs/cutter/template | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index 7142c048f53c..4a17135aca5c 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,16 +1,24 @@ # 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.3 +revision=1 +_translation_commit=974298653ba71b958e1b6c83f6011f5fefff6236 +build_style=cmake +configure_args="-DCUTTER_USE_BUNDLED_RIZIN=OFF" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools rizin" makedepends="capstone-devel python3-devel qt5-declarative-devel - qt5-location-devel qt5-svg-devel radare2" -short_desc="GUI for radare2 written in C++ and QT" + qt5-tools-devel qt5-location-devel qt5-svg-devel + syntax-highlighting-devel rizin-devel" +short_desc="GUI for rizin written in C++ and QT" maintainer="Orphaned " license="GPL-3.0-only" -homepage="https://github.com/radareorg/cutter" -distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz" -checksum=868213d2ea0b4a29b9b03c9b605c2b2155c4c03b62735a9bd376a0dadcb4fe1b +homepage="https://github.com/rizinorg/cutter" +distfiles="https://github.com/rizinorg/${pkgname}/archive/v${version}.tar.gz + https://github.com/rizinorg/cutter-translations/archive/${_translation_commit}.tar.gz" +checksum="b6ea21b8846c426ec17150ae5ef56e3e415c7e0b16190295b6bbdf367d4b755c + 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069" + +post_extract() { + rmdir src/translations + mv ../cutter-translations-${_translation_commit} src/translations +} From 82c88a960806c9c7b58c26b38054c94741883a72 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 22 Nov 2021 23:12:02 +0100 Subject: [PATCH 2/3] New package: rizin-0.3.1 --- common/shlibs | 24 ++++++++++++++ srcpkgs/rizin-devel | 1 + srcpkgs/rizin/patches/tree-sitter.patch | 16 +++++++++ srcpkgs/rizin/template | 44 +++++++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 120000 srcpkgs/rizin-devel create mode 100644 srcpkgs/rizin/patches/tree-sitter.patch create mode 100644 srcpkgs/rizin/template diff --git a/common/shlibs b/common/shlibs index ab865cc085d2..a87fca21a95e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3211,6 +3211,30 @@ libembb_mtapi_network_c.so embb-1.0.0_3 libembb_base_cpp.so embb-1.0.0_3 libembb_base_c.so embb-1.0.0_3 libhpdf-2.3.0.so Haru-2.3.0_3 +librz_analysis.so.0.3.1 rizin-0.3.1_1 +librz_core.so.0.3.1 rizin-0.3.1_1 +librz_lang.so.0.3.1 rizin-0.3.1_1 +librz_parse.so.0.3.1 rizin-0.3.1_1 +librz_util.so.0.3.1 rizin-0.3.1_1 +librz_hash.so.0.3.1 rizin-0.3.1_1 +librz_flag.so.0.3.1 rizin-0.3.1_1 +librz_debug.so.0.3.1 rizin-0.3.1_1 +librz_egg.so.0.3.1 rizin-0.3.1_1 +librz_syscall.so.0.3.1 rizin-0.3.1_1 +librz_type.so.0.3.1 rizin-0.3.1_1 +librz_search.so.0.3.1 rizin-0.3.1_1 +librz_main.so.0.3.1 rizin-0.3.1_1 +librz_config.so.0.3.1 rizin-0.3.1_1 +librz_diff.so.0.3.1 rizin-0.3.1_1 +librz_asm.so.0.3.1 rizin-0.3.1_1 +librz_socket.so.0.3.1 rizin-0.3.1_1 +librz_reg.so.0.3.1 rizin-0.3.1_1 +librz_io.so.0.3.1 rizin-0.3.1_1 +librz_bp.so.0.3.1 rizin-0.3.1_1 +librz_magic.so.0.3.1 rizin-0.3.1_1 +librz_crypto.so.0.3.1 rizin-0.3.1_1 +librz_cons.so.0.3.1 rizin-0.3.1_1 +librz_bin.so.0.3.1 rizin-0.3.1_1 libKF5Contacts.so.5 kcontacts-5.63.0_1 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1 libKF5AkonadiCore.so.5 akonadi5-17.12.0_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/patches/tree-sitter.patch b/srcpkgs/rizin/patches/tree-sitter.patch new file mode 100644 index 000000000000..d5fe8935684a --- /dev/null +++ b/srcpkgs/rizin/patches/tree-sitter.patch @@ -0,0 +1,16 @@ +--- rizin-0.3.1/subprojects/tree-sitter-c/meson.build 2021-11-22 22:04:48.051969201 +0100 ++++ - 2021-11-22 22:05:47.546282763 +0100 +@@ -4,8 +4,11 @@ + 'src/parser.c' + ] + +-tree_sitter_proj = subproject('tree-sitter', default_options: ['default_library=static']) +-tree_sitter_dep = tree_sitter_proj.get_variable('tree_sitter_dep') ++tree_sitter_dep = dependency('tree-sitter', required: true, static: false, fallback: []) ++if not tree_sitter_dep.found() ++ tree_sitter_proj = subproject('tree-sitter', default_options: ['default_library=static']) ++ tree_sitter_dep = tree_sitter_proj.get_variable('tree_sitter_dep') ++endif + + libtsc = static_library('tree-sitter-c', ts_c_files, + include_directories: ['src'], diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template new file mode 100644 index 000000000000..905fec528cd7 --- /dev/null +++ b/srcpkgs/rizin/template @@ -0,0 +1,44 @@ +# Template file for 'rizin' +pkgname=rizin +version=0.3.1 +revision=1 +_sdb_commit=db7edd4a96a89b6749b677a85d7fa4ee2c6fbbb9 +_tree_c_commit=3dd21d9440ca39d8c201335b2f3a393db41aab36 +build_style=meson +configure_args="-Duse_sys_openssl=enabled -Duse_sys_magic=enabled + -Duse_sys_capstone=enabled -Duse_sys_libzip=enabled + -Duse_sys_zlib=enabled -Duse_sys_tree_sitter=enabled + -Duse_sys_lz4=enabled -Denable_tests=true + -Dsubprojects_check=false + -Dpackager=VoidLinux -Dpackager_version=${version}_${revision}" +hostmakedepends="pkg-config" +makedepends="capstone-devel tree-sitter-devel xxHash-devel + file-devel zlib-devel libzip-devel liblz4-devel + libuv-devel openssl-devel" +short_desc="Advanced command line debugger and hexadecimal editor" +maintainer="John " +license="LGPL-3.0-only" +homepage="https://rizin.re" +distfiles="https://github.com/rizinorg/rizin/archive/v${version}.tar.gz + https://github.com/rizinorg/sdb/archive/${_sdb_commit}.tar.gz + https://github.com/rizinorg/tree-sitter-c/archive/${_tree_c_commit}.tar.gz" +checksum="1e5ce8cdc38f26529da3b3f4d57a170f506dbd1a269c4adbe8b25ebbf6e4cead + 589baa469f644f2c4220cf1e338975adebb0e8bcdaef8c9d1b5bd9950a17281f + cf21ce307bd5e38e66135acd02f3d39ca941e4e6e097c81f5e7550256c32cbdc" + +post_extract() { + mv ../sdb-${_sdb_commit} subprojects/sdb + mv ../tree-sitter-c-${_tree_c_commit} subprojects/tree-sitter-c + cp subprojects/packagefiles/tree-sitter-c/meson.build subprojects/tree-sitter-c +} + +rizin-devel_package() { + depends="rizin>=${version}_${revision} + ${makedepends}" + short_desc+=" - development files" + pkg_install() { + vmove usr/lib/pkgconfig + vmove usr/include + vmove "usr/lib/*.so" + } +} From 254b2d0b59f04b9e8a2ba6170abada0a70f36987 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 23 Nov 2021 22:45:45 +0100 Subject: [PATCH 3/3] New package: rz-ghidra-0.3.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..e623a1a048bc --- /dev/null +++ b/srcpkgs/rz-ghidra/template @@ -0,0 +1,16 @@ +# Template file for 'rz-ghidra' +pkgname=rz-ghidra +version=0.3.0 +revision=1 +wrksrc=rz-ghidra +build_style=cmake +build_helper="qemu" +hostmakedepends="pkg-config" +makedepends="rizin-devel" +short_desc="Ghidra decompiler and sleigh disassembler integration for rizin" +maintainer="John " +license="LGPL-3.0-only" +homepage="https://github.com/rizinorg/rz-ghidra" +distfiles="https://github.com/rizinorg/rz-ghidra/releases/download/v${version}/rz-ghidra-src-v${version}.tar.xz" +checksum=3363f5bf370ba8402cd7c3507578ee2c79e6170749c2b38ceefe3ccc64addea1 +ignore_elf_dirs=/usr/share/rizin/plugins