From 2e54db10029c4c942246e7fbf8c7c91e270b9577 Mon Sep 17 00:00:00 2001
From: Akatsuki Rui <3736910+akiirui@users.noreply.github.com>
Date: Thu, 20 Mar 2025 07:28:33 +0800
Subject: [PATCH] Merge PKGBUILD from official repository

---
 .SRCINFO |  7 ++++++-
 PKGBUILD | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 19eca61..9148513 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fish-git
 	pkgdesc = User friendly shell intended mostly for interactive use.
-	pkgver = 4.0b1.r101.gd5efef1cc
+	pkgver = 4.0.1.r535.ge8bd45d76
 	pkgrel = 1
 	epoch = 2
 	url = https://github.com/fish-shell/fish-shell
@@ -22,6 +22,11 @@ pkgbase = fish-git
 	depends = pcre2
 	optdepends = python: man page completion parser / web config tool
 	optdepends = pkgfile: command-not-found hook
+	optdepends = nroff: --help for built-in commmands
+	optdepends = mandoc: --help for built-in commmands (alternative)
+	optdepends = xsel: X11 clipboard integration
+	optdepends = xclip: X11 clipboard integration (alternative)
+	optdepends = wl-clipboard: Wayland clipboard integration
 	provides = fish
 	provides = fish-shell
 	conflicts = fish
diff --git a/PKGBUILD b/PKGBUILD
index 4641e0e..555a151 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,16 @@
+# Maintainer: Akatsuki Rui <aur@akii.work>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jan Fader <jan.fader@web.de>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: SanskritFritz (gmail)
 # Contributor: Stephen Drodge <stephen.drodge@gmail.com>
-# Contributor: Akatsuki Rui <aur@akii.work>
-# Maintainer: SanskritFritz (gmail)
 
 pkgname=fish-git
 _gitname="fish-shell"
-pkgver=4.0b1.r101.gd5efef1cc
+pkgver=4.0.1.r535.ge8bd45d76
 pkgrel=1
 epoch=2
 pkgdesc="User friendly shell intended mostly for interactive use."
@@ -23,6 +26,12 @@ depends=(
 optdepends=(
   'python: man page completion parser / web config tool'
   'pkgfile: command-not-found hook'
+  'nroff: --help for built-in commmands'
+  'mandoc: --help for built-in commmands (alternative)'
+  'xsel: X11 clipboard integration'
+  'xclip: X11 clipboard integration (alternative)'
+  'wl-clipboard: Wayland clipboard integration'
+
 )
 makedepends=(
   'cargo'
@@ -58,23 +67,30 @@ pkgver() {
 
 build() {
   cd "$_gitname"
+
   export CXXFLAGS+=" ${CPPFLAGS}"
-  cmake \
-    -B build \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-    -DBUILD_DOCS=True \
+
+  local cmake_options=(
+    -B build
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_DOCS=True
+    -DFISH_USE_SYSTEM_PCRE2=ON
+    -DWITH_GETTEXT=ON
     -Wno-dev
-  make -C build
+  )
+  cmake "${cmake_options[@]}"
+
+  make -C build VERBOSE=1
 }
 
 check() {
   cd "$_gitname"
-  make -C build test
+  make test
 }
 
 package() {
   cd "$_gitname"
-  make -C build DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }