From b071d9033be66517b73ff1ffcc3f77578b891566 Mon Sep 17 00:00:00 2001
From: Akatsuki Rui <3736910+akiirui@users.noreply.github.com>
Date: Mon, 20 Feb 2023 16:27:23 +0800
Subject: [PATCH] New makedepends cargo & clang and new checkdepends procps-ng

RIIR https://github.com/fish-shell/fish-shell/pull/9512
---
 .SRCINFO | 13 ++++----
 PKGBUILD | 90 +++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 83bb37a..8676157 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fish-git
 	pkgdesc = User friendly shell intended mostly for interactive use.
-	pkgver = 3.4.0.r53.g3e5284aaf
+	pkgver = 3.6.0.r217.g59fe124c4
 	pkgrel = 1
 	epoch = 2
 	url = http://fishshell.com
@@ -10,23 +10,24 @@ pkgbase = fish-git
 	arch = arm
 	license = GPL2
 	checkdepends = expect
+	checkdepends = procps-ng
+	makedepends = cargo
+	makedepends = clang
 	makedepends = cmake
-	makedepends = python-sphinx
 	makedepends = git
+	makedepends = python-sphinx
 	depends = glibc
 	depends = gcc-libs
 	depends = ncurses
 	depends = pcre2
 	optdepends = python: man page completion parser / web config tool
 	optdepends = pkgfile: command-not-found hook
-	optdepends = wl-clipboard: clipboard integration
-	optdepends = xsel: clipboard integration
-	optdepends = xclip: clipboard integration
 	provides = fish
 	provides = fish-shell
 	conflicts = fish
 	conflicts = fish-shell
+	backup = etc/fish/config.fish
 	source = git+https://github.com/fish-shell/fish-shell.git
-	md5sums = SKIP
+	b2sums = SKIP
 
 pkgname = fish-git
diff --git a/PKGBUILD b/PKGBUILD
index 4d0f8d5..8c238b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,56 +2,78 @@
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jan Fader <jan.fader@web.de>
 # Contributor: Stephen Drodge <stephen.drodge@gmail.com>
-# Contributor: akiirui (AUR)
+# Contributor: Akatsuki Rui <aur@akii.work>
 # Maintainer: SanskritFritz (gmail)
 
 pkgname=fish-git
 _gitname="fish-shell"
-pkgver=3.4.0.r53.g3e5284aaf
+pkgver=3.6.0.r217.g59fe124c4
 pkgrel=1
 epoch=2
 pkgdesc="User friendly shell intended mostly for interactive use."
 arch=('i686' 'x86_64' 'arm')
 url="http://fishshell.com"
-license=("GPL2")
-depends=('glibc' 'gcc-libs' 'ncurses' 'pcre2')
-optdepends=('python: man page completion parser / web config tool'
-            'pkgfile: command-not-found hook'
-            'wl-clipboard: clipboard integration'
-            'xsel: clipboard integration'
-            'xclip: clipboard integration')
-makedepends=('cmake' 'python-sphinx' 'git')
-checkdepends=('expect')
-provides=('fish' 'fish-shell')
-conflicts=('fish' 'fish-shell')
+license=('GPL2')
+depends=(
+  'glibc'
+  'gcc-libs'
+  'ncurses'
+  'pcre2'
+)
+optdepends=(
+  'python: man page completion parser / web config tool'
+  'pkgfile: command-not-found hook'
+)
+makedepends=(
+  'cargo'
+  'clang'
+  'cmake'
+  'git'
+  'python-sphinx'
+)
+checkdepends=(
+  'expect'
+  'procps-ng'
+)
+provides=(
+  'fish'
+  'fish-shell'
+)
+conflicts=(
+  'fish'
+  'fish-shell'
+)
+source=(
+  "git+https://github.com/fish-shell/fish-shell.git"
+)
 install='fish.install'
-source=("git+https://github.com/fish-shell/fish-shell.git")
-md5sums=('SKIP')
+backup=(etc/fish/config.fish)
+b2sums=('SKIP')
 
 pkgver() {
-	cd "$_gitname"
-	git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
-}
-
-check() {
-	cd "$_gitname"
-	make -C build test
+  cd "$_gitname"
+  git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "$_gitname"
-	export CXXFLAGS+=" ${CPPFLAGS}"
-	cmake \
-		-B build \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_DOCS=True \
-		-Wno-dev
-	make -C build
+  cd "$_gitname"
+  export CXXFLAGS+=" ${CPPFLAGS}"
+  cmake \
+    -B build \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_BUILD_TYPE=None \
+    -DBUILD_DOCS=True \
+    -Wno-dev
+  make -C build
+}
+
+check() {
+  cd "$_gitname"
+  make -C build test
 }
 
 package() {
-	cd "$_gitname"
-	make -C build DESTDIR="$pkgdir" install
+  cd "$_gitname"
+  make -C build DESTDIR="$pkgdir" install
 }