From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EFF7158094 for ; Sun, 17 Jul 2022 16:10:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4671E0D5E; Sun, 17 Jul 2022 16:10:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B006BE0D5E for ; Sun, 17 Jul 2022 16:10:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77E11340FD2 for ; Sun, 17 Jul 2022 16:09:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC8A053A for ; Sun, 17 Jul 2022 16:09:57 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1658074194.d7469bb8e7cff7cc1fe8c330dd0d9b58339bc6b1.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch X-VCS-Directories: dev-util/rizin/files/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: d7469bb8e7cff7cc1fe8c330dd0d9b58339bc6b1 X-VCS-Branch: master Date: Sun, 17 Jul 2022 16:09:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5742f166-10f5-493e-9e3a-3c02108a705d X-Archives-Hash: 1eed817905ce529f7d4b932240088e73 commit: d7469bb8e7cff7cc1fe8c330dd0d9b58339bc6b1 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Jul 15 18:29:46 2022 +0000 Commit: John Helmert III gentoo 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 levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/26421 Signed-off-by: John Helmert III 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 - -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 -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 - -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')]