rizin: update to 0.7.2

This commit is contained in:
cinerea0 2024-03-12 12:34:53 -04:00 committed by cinerea0
parent d2a0b84b2d
commit c619d96e4e
4 changed files with 62 additions and 66 deletions

View File

@ -4078,32 +4078,32 @@ libreadosm.so.1 readosm-1.1.0a_1
libSvtAv1Enc.so.1 libsvt-av1-1.3.0_1
libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
libyascreen.so.0 yascreen-1.96_1
librz_analysis.so.0.6 rizin-0.6.0_1
librz_asm.so.0.6 rizin-0.6.0_1
librz_bin.so.0.6 rizin-0.6.0_1
librz_bp.so.0.6 rizin-0.6.0_1
librz_config.so.0.6 rizin-0.6.0_1
librz_cons.so.0.6 rizin-0.6.0_1
librz_core.so.0.6 rizin-0.6.0_1
librz_crypto.so.0.6 rizin-0.6.0_1
librz_debug.so.0.6 rizin-0.6.0_1
librz_demangler.so.0.6 rizin-0.6.0_1
librz_diff.so.0.6 rizin-0.6.0_1
librz_egg.so.0.6 rizin-0.6.0_1
librz_flag.so.0.6 rizin-0.6.0_1
librz_hash.so.0.6 rizin-0.6.0_1
librz_io.so.0.6 rizin-0.6.0_1
librz_lang.so.0.6 rizin-0.6.0_1
librz_magic.so.0.6 rizin-0.6.0_1
librz_main.so.0.6 rizin-0.6.0_1
librz_parse.so.0.6 rizin-0.6.0_1
librz_reg.so.0.6 rizin-0.6.0_1
librz_search.so.0.6 rizin-0.6.0_1
librz_sign.so.0.6 rizin-0.6.0_1
librz_socket.so.0.6 rizin-0.6.0_1
librz_syscall.so.0.6 rizin-0.6.0_1
librz_type.so.0.6 rizin-0.6.0_1
librz_util.so.0.6 rizin-0.6.0_1
librz_analysis.so.0.7 rizin-0.7.2_1
librz_asm.so.0.7 rizin-0.7.2_1
librz_bin.so.0.7 rizin-0.7.2_1
librz_bp.so.0.7 rizin-0.7.2_1
librz_config.so.0.7 rizin-0.7.2_1
librz_cons.so.0.7 rizin-0.7.2_1
librz_core.so.0.7 rizin-0.7.2_1
librz_crypto.so.0.7 rizin-0.7.2_1
librz_debug.so.0.7 rizin-0.7.2_1
librz_demangler.so.0.7 rizin-0.7.2_1
librz_diff.so.0.7 rizin-0.7.2_1
librz_egg.so.0.7 rizin-0.7.2_1
librz_flag.so.0.7 rizin-0.7.2_1
librz_hash.so.0.7 rizin-0.7.2_1
librz_io.so.0.7 rizin-0.7.2_1
librz_lang.so.0.7 rizin-0.7.2_1
librz_magic.so.0.7 rizin-0.7.2_1
librz_main.so.0.7 rizin-0.7.2_1
librz_parse.so.0.7 rizin-0.7.2_1
librz_reg.so.0.7 rizin-0.7.2_1
librz_search.so.0.7 rizin-0.7.2_1
librz_sign.so.0.7 rizin-0.7.2_1
librz_socket.so.0.7 rizin-0.7.2_1
librz_syscall.so.0.7 rizin-0.7.2_1
librz_type.so.0.7 rizin-0.7.2_1
librz_util.so.0.7 rizin-0.7.2_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
libnvme.so.1 libnvme-1.0_1

View File

@ -0,0 +1,22 @@
diff --git a/meson.build b/meson.build
index 614563588b2..b7f0330dae3 100644
--- a/meson.build
+++ b/meson.build
@@ -204,7 +204,7 @@ endif
pcre2_dep_opt = get_option('use_sys_pcre2')
pcre2_dep = disabler()
-if (pcre2_dep_opt.enabled() or pcre2_dep_opt.auto()) and not meson.is_cross_build()
+if (pcre2_dep_opt.enabled() or pcre2_dep_opt.auto())
pcre2_dep = dependency('libpcre2-8', required: false, static: false)
if not pcre2_dep.found()
pcre2_dep = cc.find_library('pcre2', required: true, static: true)
@@ -214,7 +214,7 @@ else
endif
if meson.is_cross_build()
- pcre2_native_dep = dependency('pcre2_cross_native', required: true, static: true, native: true)
+ pcre2_native_dep = dependency('libpcre2-8', required: true, static: false, native: true)
endif
# handle magic library

View File

@ -1,34 +0,0 @@
From 07f92a82df1ef6d4c73ca18ee116a4af4895f343 Mon Sep 17 00:00:00 2001
From: Gleb Popov <6yearold@gmail.com>
Date: Mon, 29 Jan 2024 16:14:40 +0300
Subject: [PATCH] rizin-shell-parser: Fix build with newest tree-sitter (#4165)
---
subprojects/rizin-shell-parser/src/parser.c | 2 +-
subprojects/rizin-shell-parser/src/scanner.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/rizin-shell-parser/src/parser.c b/subprojects/rizin-shell-parser/src/parser.c
index 21e270b58fa..3f83e0bf0b8 100644
--- a/subprojects/rizin-shell-parser/src/parser.c
+++ b/subprojects/rizin-shell-parser/src/parser.c
@@ -1,4 +1,4 @@
-#include <tree_sitter/parser.h>
+#include "tree_sitter/parser.h"
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
diff --git a/subprojects/rizin-shell-parser/src/scanner.c b/subprojects/rizin-shell-parser/src/scanner.c
index 133c5850da9..9c17e4a0c13 100644
--- a/subprojects/rizin-shell-parser/src/scanner.c
+++ b/subprojects/rizin-shell-parser/src/scanner.c
@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
// SPDX-License-Identifier: LGPL-3.0-only
-#include <tree_sitter/parser.h>
+#include "tree_sitter/parser.h"
#include <ctype.h>
#include <wctype.h>
#include <stdio.h>

View File

@ -1,26 +1,34 @@
# Template file for 'rizin'
pkgname=rizin
version=0.6.3
version=0.7.2
revision=1
build_style=meson
configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v5
-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_sys_lzma=enabled -D use_sys_libmspack=enabled
-D local=disabled -D packager=VoidLinux"
-D use_sys_lz4=enabled -D use_sys_libzstd=enabled -D use_sys_lzma=enabled
-D use_sys_xxhash=enabled -D use_sys_openssl=enabled
-D use_sys_libmspack=enabled -D use_sys_tree_sitter=enabled
-D use_sys_pcre2=enabled -D local=disabled -D packager=VoidLinux
-D packager_version=${version}_${revision}"
hostmakedepends="pkg-config"
makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel
tree-sitter-devel file-devel openssl-devel liblzma-devel libmspack-devel"
tree-sitter-devel file-devel openssl-devel liblzma-devel libmspack-devel
libzstd-devel pcre2-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://rizin.re"
changelog="https://github.com/rizinorg/rizin/releases"
distfiles="https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"
checksum=95f64c6ab9e6daa9e9fa5634398eb8f6cdb4ebf2e814da2e4cb969d31f4509c2
checksum=fcff3fb45ae2b75e3f604bc7a08076e322e6e14def79098186378065ccb3582a
# requires some external files, not clear where they come from
make_check=no
if [ "${CROSS_BUILD}" ]; then
# Requires a native version of pcre2 to compile
hostmakedepends+=" pcre2-devel"
fi
rizin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc="${short_desc} - development files"