From 7fdc1251b7205263da7b5360aee17a5c5f82f7c5 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 31 Aug 2023 05:19:31 +0100
Subject: dev-util/rizin: fix build w/ >=tree-sitter-0.20.8-r1

>=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://github.com/tree-sitter/tree-sitter/pull/2573
* https://github.com/tree-sitter/tree-sitter/pull/2574

Bug: https://bugs.gentoo.org/912716
Closes: https://bugs.gentoo.org/913343
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../rizin-0.5.2-find-tree-sitter-parser.patch      | 33 ++++++++++++++++++++++
 dev-util/rizin/rizin-0.5.2.ebuild                  |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch

(limited to 'dev-util')

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
new file mode 100644
index 000000000000..27811e9930ee
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch
@@ -0,0 +1,33 @@
+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>
diff --git a/dev-util/rizin/rizin-0.5.2.ebuild b/dev-util/rizin/rizin-0.5.2.ebuild
index 9d91882992da..3a1e1579d4fb 100644
--- a/dev-util/rizin/rizin-0.5.2.ebuild
+++ b/dev-util/rizin/rizin-0.5.2.ebuild
@@ -41,6 +41,7 @@ BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
+	"${FILESDIR}/${PN}-0.5.2-find-tree-sitter-parser.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"
-- 
cgit v1.2.3-65-gdbad