[PREVIEW] fish: update to 4.0

app-shells/fish/autobuild/beyond

@@ -1,2 +1,2 @@
-abinfo "Removing completion for rclone to resolve file conflict ..."
-rm -v "$PKGDIR"/usr/share/fish/completions/rclone.fish
+abinfo "Removing some completions to resolve file conflicts ..."
+rm -v "$PKGDIR"/usr/share/fish/completions/{rclone,just}.fish

app-shells/fish/autobuild/defines

@@ -1,11 +1,19 @@
 PKGNAME=fish
 PKGSEC=shells
-PKGDEP="bc gcc-runtime inetutils ncurses which"
-BUILDDEP="sphinx"
+PKGDEP="bc gcc-runtime ncurses gettext coreutils findutils gawk python-3 \
+        groff pcre2"
+BUILDDEP="sphinx rustc llvm which"
 PKGDES="A smart and user-friendly shell intended mostly for interactive use"
 
-CMAKE_AFTER="-DBUILD_DOCS=True \
+CMAKE_AFTER="-DBUILD_DOCS=ON \
+             -DFISH_USE_SYSTEM_PCRE2=ON \
+             -DWITH_GETTEXT=ON \
              -DCMAKE_INSTALL_SYSCONFDIR=/etc"
 
+USECLANG=1
 ABSHADOW=0
 RECONF=0
+
+# FIXME: ld.lld: error: relocation R_MIPS_64 cannot be used against symbol
+# 'DW.ref.rust_eh_personality'; recompile with -fPIC
+NOLTO__LOONGSON3=1

app-shells/fish/autobuild/patches/0001-Remove-SIGUNUSED.patch

@@ -0,0 +1,32 @@
+From 467ef22cceb562ea6342b0224e8272e2f533bd62 Mon Sep 17 00:00:00 2001
+From: Fabian Boehm <[email protected]>
+Date: Mon, 23 Dec 2024 17:01:04 +0100
+Subject: [PATCH 1/3] Remove SIGUNUSED
+
+It is, as the name implies, unused - it became SIGSYS, which we
+already check.
+
+Since it is entirely undefined on some architectures it causes a build
+failure there, see discussion in #10633
+---
+ src/signal.rs | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/signal.rs b/src/signal.rs
+index 6aa995f98..9b51e6dfe 100644
+--- a/src/signal.rs
++++ b/src/signal.rs
+@@ -407,10 +407,6 @@ const SIGNAL_TABLE : &[LookupEntry] = &[
+     #[cfg(target_os = "linux")]
+     LookupEntry::new(libc::SIGIOT,   L!("SIGIOT"), L!("Abort (Alias for SIGABRT)")),
+
+-    #[cfg(target_os = "linux")]
+-    #[allow(deprecated)]
+-    LookupEntry::new(libc::SIGUNUSED, L!("SIGUNUSED"), L!("Unused signal")),
+-
+     #[cfg(target_os = "linux")]
+     LookupEntry::new(libc::SIGPWR,    L!("SIGPWR"), L!("Power failure")),
+
+-- 
+2.47.1
+

app-shells/fish/autobuild/patches/0002-Disable-SIGSTKFLT-on-mips.patch

@@ -0,0 +1,26 @@
+From 23ced1620221537f84b4a9b1e4c4d0f895bbf938 Mon Sep 17 00:00:00 2001
+From: Kaiyang Wu <[email protected]>
+Date: Mon, 23 Dec 2024 16:55:35 -0800
+Subject: [PATCH 2/3] Disable SIGSTKFLT on mips
+
+Signed-off-by: Kaiyang Wu <[email protected]>
+---
+ src/signal.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/signal.rs b/src/signal.rs
+index 9b51e6dfe..699ff455c 100644
+--- a/src/signal.rs
++++ b/src/signal.rs
+@@ -401,7 +401,7 @@ const SIGNAL_TABLE : &[LookupEntry] = &[
+     #[cfg(any(bsd, target_os = "macos"))]
+     LookupEntry::new(libc::SIGINFO,   L!("SIGINFO"), L!("Information request")),
+
+-    #[cfg(target_os = "linux")]
++    #[cfg(all(target_os = "linux", not(target_arch = "mips64")))]
+     LookupEntry::new(libc::SIGSTKFLT, L!("SISTKFLT"), L!("Stack fault")),
+
+     #[cfg(target_os = "linux")]
+-- 
+2.47.1
+

app-shells/fish/autobuild/patches/0003-Fix-typo-in-hard-coded-name-of-SIGSTKFLT.patch

@@ -0,0 +1,39 @@
+From 995e033e75eae5f4741247a965e2860c1be1e897 Mon Sep 17 00:00:00 2001
+From: Mahmoud Al-Qudsi <[email protected]>
+Date: Mon, 23 Dec 2024 14:29:00 -0600
+Subject: [PATCH 3/3] Fix typo in hard-coded name of SIGSTKFLT
+
+---
+ Cargo.lock    | 2 +-
+ src/signal.rs | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index c5d216c53..394e7d328 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -112,7 +112,7 @@ dependencies = [
+
+ [[package]]
+ name = "fish"
+-version = "4.0.0-alpha1"
++version = "4.0.0-beta.1"
+ dependencies = [
+  "bitflags",
+  "cc",
+diff --git a/src/signal.rs b/src/signal.rs
+index 699ff455c..26f4b19c2 100644
+--- a/src/signal.rs
++++ b/src/signal.rs
+@@ -402,7 +402,7 @@ const SIGNAL_TABLE : &[LookupEntry] = &[
+     LookupEntry::new(libc::SIGINFO,   L!("SIGINFO"), L!("Information request")),
+
+     #[cfg(all(target_os = "linux", not(target_arch = "mips64")))]
+-    LookupEntry::new(libc::SIGSTKFLT, L!("SISTKFLT"), L!("Stack fault")),
++    LookupEntry::new(libc::SIGSTKFLT, L!("SIGSTKFLT"), L!("Stack fault")),
+
+     #[cfg(target_os = "linux")]
+     LookupEntry::new(libc::SIGIOT,   L!("SIGIOT"), L!("Abort (Alias for SIGABRT)")),
+-- 
+2.47.1
+

app-shells/fish/spec

@@ -1,4 +1,5 @@
-VER=3.7.1
-SRCS="git::commit=tags/$VER::https://github.com/fish-shell/fish-shell"
+UPSTREAM_VER=4.0b1
+VER=${UPSTREAM_VER/b/~beta}
+SRCS="git::commit=tags/$UPSTREAM_VER::https://github.com/fish-shell/fish-shell"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=815"