George Rawlinson pushed to branch main at Arch Linux / Packaging / Packages /
fish
Commits:
39f2ca56 by George Rawlinson at 2025-03-19T19:25:02+13:00
upgpkg: 4.0.1-2
Packaging fixes as per MR #4.
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = fish
pkgdesc = Smart and user friendly shell intended mostly for interactive
use
pkgver = 4.0.1
- pkgrel = 1
+ pkgrel = 2
url = https://fishshell.com/
install = fish.install
arch = x86_64
@@ -19,6 +19,11 @@ pkgbase = fish
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
options = !lto
backup = etc/fish/config.fish
source =
fish::git+https://github.com/fish-shell/fish-shell#tag=4.0.1?signed
=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@
pkgname=fish
pkgver=4.0.1
-pkgrel=1
+pkgrel=2
pkgdesc='Smart and user friendly shell intended mostly for interactive use'
url='https://fishshell.com/'
arch=('x86_64')
@@ -32,16 +32,21 @@
sha512sums=('df2a45a46ed0097333f04a4088895208b3069fe92a39acc0f705444a47564189b22
build() {
cd ${pkgname}
+
export CXXFLAGS+=" ${CPPFLAGS}"
- cmake \
- -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 \
+
+ 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
+ )
+ cmake "${cmake_options[@]}"
+
make -C build VERBOSE=1
}
@@ -52,7 +57,8 @@ check() {
package() {
cd ${pkgname}
- make -C build DESTDIR="${pkgdir}" install
+
+ DESTDIR="$pkgdir" cmake --install build
}
# vim: ts=2 sw=2 et:
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/fish/-/commit/39f2ca5699fccd4c97cfdf18cce16ff3362847f4
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/fish/-/commit/39f2ca5699fccd4c97cfdf18cce16ff3362847f4
You're receiving this email because of your account on gitlab.archlinux.org.
