From ea8a35a105537ec1caa82ed655f0d71ff804a01b Mon Sep 17 00:00:00 2001 From: Urs Schulz 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 " +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 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 + + #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING +-# include +-# include +-# include ++# include ++# include ++# include + #endif + + #include "common/ColorThemeWorker.h" +diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp +index 64a2038e..eebb59f9 100644 +--- a/src/common/SyntaxHighlighter.cpp ++++ b/src/common/SyntaxHighlighter.cpp +@@ -5,7 +5,7 @@ + + # include "Configuration.h" + +-# include ++# include + + SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document) + : KSyntaxHighlighting::SyntaxHighlighter(document) +diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h +index b9e88970..a21b4ec2 100644 +--- a/src/common/SyntaxHighlighter.h ++++ b/src/common/SyntaxHighlighter.h +@@ -10,7 +10,7 @@ + + #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING + +-# include ++# include + + class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter + { diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index 7142c048f53c..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 " +maintainer="Urs Schulz " 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" +}