* update fish to 3.1.0

fish/PKGBUILD

@@ -7,41 +7,35 @@
 # Contributor: Jan Fader <jan.fader@web.de>
 
 pkgname=fish
-pkgver=3.0.2
-pkgrel=3
+pkgver=3.1.0
+pkgrel=2
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 url='https://fishshell.com/'
 arch=(x86_64 powerpc64le)
 license=('GPL2')
-depends=('glibc' 'gcc-libs' 'jq' 'ncurses' 'pcre2')
+depends=('glibc' 'gcc-libs' 'ncurses' 'pcre2')
 optdepends=('python: man page completion parser / web config tool'
             'pkgfile: command-not-found hook')
-makedepends=('doxygen')
+makedepends=('cmake' 'python-sphinx')
 install=fish.install
-source=(https://github.com/fish-shell/fish-shell/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        fish-fix-systemd-version.patch::https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch)
-sha256sums=('0421a3fdf5df54c14cddd4d764bc0931bbb4d37fb799205a9457c6eaba513166'
-            'b74077f1ae695ec4cd31acc8e1d4140ed2323716e1d0fac1cc2c66d06329431a')
-sha512sums=('d3a24f85d4ada891ec4f6b14733edb236ae67f34868b0c9115fa5ebae99202a747ee9aeec7c6b04702f9a608019d5964b9cdc9abc4e3edfd7aaa9335093d8881'
-            'f4762c4fc6fcff7c52a9d10aa9b32d3470e0f5cee222927e2beccd0bb7fccf27fb628b33a9db7971362c38e53c2452f5cca513495bd6227e6b140afbd186217e')
-
-prepare() {
-  cd fish-shell-${pkgver}
-  patch -p1 < ../fish-fix-systemd-version.patch
-  echo ${pkgver} > version
-  autoreconf -fiv
-}
+backup=(etc/fish/config.fish)
+source=(https://github.com/fish-shell/fish-shell/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('e5db1e6839685c56f172e1000c138e290add4aa521f187df4cd79d4eab294368')
+sha512sums=('143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff')
 
 build() {
-  cd fish-shell-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
+  mkdir ${pkgname}-${pkgver}/build
+  cd ${pkgname}-${pkgver}/build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_DOCS=True
   make
 }
 
 package() {
-  cd fish-shell-${pkgver}
+  cd ${pkgname}-${pkgver}/build
   make DESTDIR="${pkgdir}" install
 }
 

fish/fish.install

@@ -1,5 +1,6 @@
 post_install() {
   grep -qe '^/usr/bin/fish$' etc/shells || echo '/usr/bin/fish' >> etc/shells
+  grep -qe '^/bin/fish$' etc/shells || echo '/bin/fish' >> etc/shells
 }
 
 post_upgrade() {
@@ -7,7 +8,7 @@ post_upgrade() {
 }
 
 pre_remove() {
-  sed -ri '\|^/usr/bin/fish$|d' etc/shells
+  sed -ri -e '\|^/usr/bin/fish$|d' -e '\|^/bin/fish$|d' etc/shells
 }
 
 # vim:set ts=2 sw=2 et: