[gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/

[John Helmert III]

commit:     9a38a626c1bf80bfb75ad3023eece52402f572a7
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  6 19:09:28 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 19:09:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a38a626

dev-util/rizin: fix patch's commit email

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
index 5231da0c7eaf..0f5586c0023d 100644
--- a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
+++ b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
@@ -1,5 +1,5 @@
 commit 9bcfa2a6d3eaa5df00ae728c44811faf08effbd3
-Author: John Helmert III <jchelmert3@posteo.net>
+Author: John Helmert III <ajak@gentoo.org>
 Date:   Thu Jan 6 11:12:58 2022 -0600
 
     shlr/rizin-shell-parser/src: Never rebuild parser.c

[gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/

[John Helmert III]

commit:     d7469bb8e7cff7cc1fe8c330dd0d9b58339bc6b1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jul 15 18:29:46 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 16:09:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7469bb8

dev-util/rizin: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26421
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 .../rizin/files/rizin-0.3.0-typedb-prefix.patch    | 132 ---------------------
 .../files/rizin-0.3.2-never-rebuild-parser.patch   |  36 ------
 2 files changed, 168 deletions(-)

diff --git a/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch b/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch
deleted file mode 100644
index dfb86447df71..000000000000
--- a/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-https://github.com/rizinorg/rizin/issues/1789
-
-Signed-off-by: Florian Märkl <info@florianmaerkl.de>
-
-diff --git a/test/unit/test_serialize_analysis.c b/test/unit/test_serialize_analysis.c
-index 51092c067..0d714ba90 100644
---- a/test/unit/test_serialize_analysis.c
-+++ b/test/unit/test_serialize_analysis.c
-@@ -546,7 +546,10 @@ Sdb *vars_ref_db() {
- }
- 
- bool test_analysis_var_save() {
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	RzAnalysis *analysis = rz_analysis_new();
- 	rz_analysis_use(analysis, "x86");
- 	rz_analysis_set_bits(analysis, 64);
-diff --git a/test/unit/test_type.c b/test/unit/test_type.c
-index d8a3d9c5f..3956a800b 100644
---- a/test/unit/test_type.c
-+++ b/test/unit/test_type.c
-@@ -379,7 +379,10 @@ static bool test_enum_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -417,7 +420,10 @@ static bool test_const_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -469,7 +475,10 @@ static bool test_type_as_string(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -516,7 +525,10 @@ static bool test_array_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -569,7 +581,10 @@ static bool test_struct_func_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -659,7 +674,10 @@ static bool test_struct_array_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -707,7 +725,10 @@ static bool test_struct_identifier_without_specifier(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -735,7 +756,10 @@ static bool test_union_identifier_without_specifier(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -767,7 +791,10 @@ static bool test_edit_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;

diff --git a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
deleted file mode 100644
index 0f5586c0023d..000000000000
--- a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 9bcfa2a6d3eaa5df00ae728c44811faf08effbd3
-Author: John Helmert III <ajak@gentoo.org>
-Date:   Thu Jan 6 11:12:58 2022 -0600
-
-    shlr/rizin-shell-parser/src: Never rebuild parser.c
-    
-    This requires dev-libs/tree-sitter[ts-cli] and net-libs/nodejs, both
-    of which would be heavy new dependencies. However, these are only
-    needed to rebuild the already-existing tree-sitter parser, which
-    doesn't do much for us (if anything) since it already exists. In this
-    case, it's better to just reduce fragility by unconditionally
-    disabling this.
-    
-    Bug: https://bugs.gentoo.org/830068
-    Signed-off-by: John Helmert III <ajak@gentoo.org>
-
-diff --git a/shlr/rizin-shell-parser/src/meson.build b/shlr/rizin-shell-parser/src/meson.build
-index 0171183ae0..81dcc13b33 100644
---- a/shlr/rizin-shell-parser/src/meson.build
-+++ b/shlr/rizin-shell-parser/src/meson.build
-@@ -1,14 +1,4 @@
--tree_sitter_bin = find_program('tree-sitter', required: false)
--node_bin = find_program('node', required: false)
--if tree_sitter_bin.found() and node_bin.found() and tree_sitter_dep.type_name() != 'internal'
--  parser_c = custom_target('parser_src_c',
--    command: [tree_sitter_wrap_py, tree_sitter_bin, '@OUTDIR@/..', '@INPUT@'],
--    input: [grammar_js],
--    output: 'parser.c',
--  )
--else
--  parser_c = files('parser.c')
--endif
-+parser_c = files('parser.c')
- 
- shell_parser_files = [files('scanner.c'), parser_c]
- shell_parser_inc = [platform_inc, include_directories('tree_sitter')]

[gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/

[Joonas Niilola]

commit:     2bf7cecfe13c34821c6d64974fca4c7b3aaa0706
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Aug 20 06:34:38 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 06:52:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf7cecf

dev-util/rizin: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../rizin-0.5.2-find-tree-sitter-parser.patch      | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch b/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch
deleted file mode 100644
index 27811e9930ee..000000000000
--- a/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/913343
-
->=tree-sitter-0.20.8-r1 doesn't install parser.h anymore because it may be
-mismatched with the version used to build the parser. Use one bundled with
-rizin-shell-parser instead.
-
-This should propagate into rizin-shell-parser when they regenerate
-with a newer tree-sitter release (once one is made).
-
-See also:
-* https://bugs.gentoo.org/912716
-* https://bugs.gentoo.org/913343
-* https://github.com/tree-sitter/tree-sitter/pull/2573
-* https://github.com/tree-sitter/tree-sitter/pull/2574
---- 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
---- 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>