From 42bfbe569236496abc31c767e4310b6ff816b303 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 10 Aug 2024 14:02:38 +0200
Subject: [PATCH] radare2, bump version (#10795)

---
 .../radare2/patches/radare2-5.8.8.patchset    | 87 -------------------
 ...are2-5.8.8.recipe => radare2-5.9.4.recipe} | 16 +++-
 2 files changed, 13 insertions(+), 90 deletions(-)
 delete mode 100644 dev-util/radare2/patches/radare2-5.8.8.patchset
 rename dev-util/radare2/{radare2-5.8.8.recipe => radare2-5.9.4.recipe} (97%)

diff --git a/dev-util/radare2/patches/radare2-5.8.8.patchset b/dev-util/radare2/patches/radare2-5.8.8.patchset
deleted file mode 100644
index 9c5e031fe..000000000
--- a/dev-util/radare2/patches/radare2-5.8.8.patchset
+++ /dev/null
@@ -1,87 +0,0 @@
-From 25a8698403844bd36fc2def2e785e13955e2e01a Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Fri, 16 Jun 2023 09:57:13 +0200
-Subject: Use system header for lz4
-
-
-diff --git a/libr/util/zip.c b/libr/util/zip.c
-index bb1c383..83571ae 100644
---- a/libr/util/zip.c
-+++ b/libr/util/zip.c
-@@ -2,7 +2,7 @@
- 
- #include <r_util.h>
- #include <zlib.h>
--#include "../../../shlr/lz4/lz4.h"
-+#include <lz4.h>
- 
- // set a maximum output buffer of 50MB
- #define MAXOUT 50000000
--- 
-2.37.3
-
-
-From f385442963b5a5ffd253ab0e22b46a8991ebadb9 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Fri, 16 Jun 2023 10:13:18 +0200
-Subject: Fix linking with libnetwork
-
-
-diff --git a/libr/io/meson.build b/libr/io/meson.build
-index fa7891f..53bc8a4 100644
---- a/libr/io/meson.build
-+++ b/libr/io/meson.build
-@@ -72,6 +72,12 @@ r_io_deps = [
-   pth
- ]
- 
-+if host_machine.system() == 'haiku'
-+  r_io_deps += [
-+    cc.find_library('network')
-+  ]
-+endif
-+
- if host_machine.system() == 'linux' or host_machine.system() == 'android'
-   r_io_sources += [
-     'p/io_r2k_linux.c',
-diff --git a/libr/socket/meson.build b/libr/socket/meson.build
-index 135c7b5..bb2c263 100644
---- a/libr/socket/meson.build
-+++ b/libr/socket/meson.build
-@@ -18,6 +18,12 @@ if get_option('blob')
-   endif
- endif
- 
-+if host_machine.system() == 'haiku'
-+  r_util_deps += [
-+    cc.find_library('network')
-+  ]
-+endif
-+
- if use_sys_openssl
-   r_util_deps += [sys_openssl]
- endif
--- 
-2.37.3
-
-
-From 34a91499a9db996b9177da484b1886d5ce69ccbd Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Fri, 16 Jun 2023 10:42:06 +0200
-Subject: Haiku doesn't have ptrace
-
-
-diff --git a/meson.build b/meson.build
-index 654d8df..ead01b3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -321,7 +321,7 @@ else
- endif
- 
- has_debugger = get_option('debugger')
--have_ptrace = not ['windows', 'cygwin', 'sunos'].contains(host_machine.system())
-+have_ptrace = not ['windows', 'cygwin', 'haiku', 'sunos'].contains(host_machine.system())
- can_ptrace_wrap = ['linux'].contains(host_machine.system())
- 
- have_ptrace = have_ptrace and has_debugger
-
diff --git a/dev-util/radare2/radare2-5.8.8.recipe b/dev-util/radare2/radare2-5.9.4.recipe
similarity index 97%
rename from dev-util/radare2/radare2-5.8.8.recipe
rename to dev-util/radare2/radare2-5.9.4.recipe
index a5ef131be..a1e3f496e 100644
--- a/dev-util/radare2/radare2-5.8.8.recipe
+++ b/dev-util/radare2/radare2-5.9.4.recipe
@@ -98,9 +98,8 @@ LICENSE="GNU GPL v3
 	GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/radare/radare2/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="4f88c33e4391f492c7d0073df9bffcc666cc1e2ca0a95d6e1035decdaa227b26"
+CHECKSUM_SHA256="4b194a73ce8dfe12c0b8c70cf6af449260119588ceacc205ac95570bbf17cdd3"
 SOURCE_FILENAME="radare2-$portVersion.tar.gz"
-PATCHES="radare2-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -261,7 +260,7 @@ BUILD()
 	rm -rf shlr/zip/{zip,zlib,include}
 	rm -rf shlr/lz4/{deps.mk,LICENSE,lz4.*,Makefile,README.md}
 	rm -f libr/hash/xxhash.c libr/hash/xxhash.h
-	
+
 	meson build --buildtype=release \
 		--prefix=$prefix \
 		--bindir=$commandBinDir \
@@ -277,6 +276,10 @@ BUILD()
 	ninja -C build $jobArgs
 }
 
+TEST_REQUIRES="
+	cmd:radare2
+	"
+
 INSTALL()
 {
 	ninja -C build install
@@ -293,6 +296,13 @@ INSTALL()
 
 TEST()
 {
+#	SUMMARY
+#	Ok:                 60
+#	Expected Fail:      0
+#	Fail:               5
+#	Unexpected Pass:    0
+#	Skipped:            0
+#	Timeout:            0
 	unset meson
 	meson test --no-rebuild --print-errorlogs -C build
 }