From 5526dd6fe328ff996d1bbafef6355da6560b764c Mon Sep 17 00:00:00 2001
From: Ivan Holmes <ivan@ivanholmes.co.uk>
Date: Fri, 11 Nov 2022 19:29:54 +0000
Subject: [PATCH] fish: bump version (#7110)

* update fish recipe to 3.5.1

* switch to release

* reorder BUILD_PREREQUIRES and use cmakeDirArgs
---
 .../{fish-2.7.1.recipe => fish-3.5.1.recipe}  | 26 ++++----
 app-shells/fish/patches/fish-3.5.1.patchset   | 59 +++++++++++++++++++
 2 files changed, 70 insertions(+), 15 deletions(-)
 rename app-shells/fish/{fish-2.7.1.recipe => fish-3.5.1.recipe} (76%)
 create mode 100644 app-shells/fish/patches/fish-3.5.1.patchset

diff --git a/app-shells/fish/fish-2.7.1.recipe b/app-shells/fish/fish-3.5.1.recipe
similarity index 76%
rename from app-shells/fish/fish-2.7.1.recipe
rename to app-shells/fish/fish-3.5.1.recipe
index 350c52954..1d2bcdd2b 100644
--- a/app-shells/fish/fish-2.7.1.recipe
+++ b/app-shells/fish/fish-3.5.1.recipe
@@ -5,13 +5,13 @@ is simple but incompatible with other shell languages."
 HOMEPAGE="https://ridiculousfish.com/shell/"
 COPYRIGHT="2005-2018 Axel Liljencrantz"
 LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://github.com/fish-shell/fish-shell/releases/download/$portVersion/fish-$portVersion.tar.gz"
-CHECKSUM_SHA256="e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a"
+REVISION="1"
+SOURCE_URI="https://github.com/fish-shell/fish-shell/releases/download/$portVersion/fish-$portVersion.tar.xz"
+CHECKSUM_SHA256="a6d45b3dc5a45dd31772e7f8dfdfecabc063986e8f67d60bd7ca60cc81db6928"
 PATCHES="fish-$portVersion.patchset"
 
-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 GLOBAL_WRITABLE_FILES="
 	settings/fish/config.fish keep-old
@@ -26,8 +26,6 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:gettext$secondaryArchSuffix
-	cmd:python
-	cmd:ul
 	lib:libexecinfo$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -36,7 +34,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= r1~alpha4_pm_hrev51519-1
+	haiku${secondaryArchSuffix}_devel
 	devel:libexecinfo$secondaryArchSuffix
 	devel:libgettextlib$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
@@ -44,7 +42,7 @@ BUILD_REQUIRES="
 	devel:libpcre2_32$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:awk
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
@@ -56,12 +54,10 @@ defineDebugInfoPackage fish$secondaryArchSuffix \
 
 BUILD()
 {
-	export CFLAGS="-D_BSD_SOURCE"
-	export CXXFLAGS=$CFLAGS
-	export LIBS="-lnetwork -lexecinfo"
-
-	runConfigure ./configure \
-		--without-included-pcre2
+	mkdir -p build && cd build
+	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs
 
 	make $jobArgs
 }
diff --git a/app-shells/fish/patches/fish-3.5.1.patchset b/app-shells/fish/patches/fish-3.5.1.patchset
new file mode 100644
index 000000000..e294257f2
--- /dev/null
+++ b/app-shells/fish/patches/fish-3.5.1.patchset
@@ -0,0 +1,59 @@
+From 21ae0a493f309006033103a44f31be43cc78ef08 Mon Sep 17 00:00:00 2001
+From: Ivan Holmes <ivan@ivanholmes.co.uk>
+Date: Wed, 17 Aug 2022 19:30:18 +0100
+Subject: Don't include mount.h on Haiku
+
+
+diff --git a/src/path.cpp b/src/path.cpp
+index d5a649e..b920d7a 100644
+--- a/src/path.cpp
++++ b/src/path.cpp
+@@ -6,7 +6,9 @@
+ #include "path.h"
+ 
+ #include <errno.h>
++#ifndef __HAIKU__
+ #include <sys/mount.h>
++#endif
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #if defined(__linux__)
+diff --git a/src/wutil.cpp b/src/wutil.cpp
+index 21ec26d..1848948 100644
+--- a/src/wutil.cpp
++++ b/src/wutil.cpp
+@@ -11,7 +11,9 @@
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifndef __HAIKU__
+ #include <sys/mount.h>
++#endif
+ #include <sys/stat.h>
+ #include <sys/statvfs.h>
+ #include <sys/types.h>
+-- 
+2.36.1
+
+
+From 74736c3a8584cc05327804cbb13e666dc94efe7b Mon Sep 17 00:00:00 2001
+From: Ivan Holmes <ivan@ivanholmes.co.uk>
+Date: Wed, 17 Aug 2022 19:30:41 +0100
+Subject: remove assertion that exit codes are less than 256
+
+
+diff --git a/src/proc.h b/src/proc.h
+index 6ac42c7..7d9b719 100644
+--- a/src/proc.h
++++ b/src/proc.h
+@@ -90,7 +90,6 @@ class proc_status_t {
+         constexpr int zerocode = w_exitcode(0, 0);
+         static_assert(WIFEXITED(zerocode), "Synthetic exit status not reported as exited");
+ 
+-        assert(ret < 256);
+         return proc_status_t(w_exitcode(ret, 0 /* sig */));
+     }
+ 
+-- 
+2.36.1
+