Skip to content

Instantly share code, notes, and snippets.

@crabvk
Last active February 22, 2020 00:50
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save crabvk/3b28a416fac109dc1787ea43ef9e1b0a to your computer and use it in GitHub Desktop.
Save crabvk/3b28a416fac109dc1787ea43ef9e1b0a to your computer and use it in GitHub Desktop.
ArchLinux fish PKGBUILD patch 3.0.2-3 -> 3.1.0-1
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 2ae4ddf..8a4c82d 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -6,41 +6,32 @@
# Contributor: Jan Fader <jan.fader@web.de>
pkgname=fish
-pkgver=3.0.2
-pkgrel=3
+pkgver=3.1.0
+pkgrel=1
pkgdesc='Smart and user friendly shell intended mostly for interactive use'
url='https://fishshell.com/'
arch=('x86_64')
license=('GPL2')
depends=('glibc' 'gcc-libs' 'jq' 'ncurses' 'pcre2')
optdepends=('python: man page completion parser / web config tool'
- 'pkgfile: command-not-found hook')
-makedepends=('doxygen')
+ 'pkgfile: command-not-found hook',
+ 'gettext: translation support')
+makedepends=('cmake' 'make' '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
-}
+source=(https://github.com/fish-shell/fish-shell/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('29f24e9b1344ec7048076a6081286f717c8b9a9119397db6e57d31949657d2f4')
+sha512sums=('ffb69aff3aa8b272ac1cd09566a8222b06ecfcf436c3c80770c93e0656c15f4fbac49fcdeab05e639e4633400d370070e761ef6d836de8df4cf545fe8e6745ef')
build() {
cd fish-shell-${pkgver}
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc
+ echo -n ${pkgver} > version
+ mkdir build; cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make
}
package() {
- cd fish-shell-${pkgver}
+ cd fish-shell-${pkgver}/build
make DESTDIR="${pkgdir}" install
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment