fish: fix for building with cmake 4

I also tried switching to ninja, but with that man pages
are not installed somehow.
This commit is contained in:
Christoph Reiter 2025-03-30 10:13:24 +02:00
parent e5d309f981
commit 4458e84e69
2 changed files with 32 additions and 6 deletions

View File

@ -0,0 +1,18 @@
--- fish-3.7.1/cmake/Tests.cmake.orig 2025-03-30 10:38:59.107492700 +0200
+++ fish-3.7.1/cmake/Tests.cmake 2025-03-30 10:39:21.414080300 +0200
@@ -41,15 +41,6 @@
USES_TERMINAL
)
-# If CMP0037 is available, also make an alias "test" target.
-# Note that this policy may not be available, in which case definining such a target silently fails.
-cmake_policy(PUSH)
-if(POLICY CMP0037)
- cmake_policy(SET CMP0037 OLD)
- add_custom_target(test DEPENDS fish_run_tests)
-endif()
-cmake_policy(POP)
-
# Build the low-level tests code
add_executable(fish_tests EXCLUDE_FROM_ALL
src/fish_tests.cpp)

View File

@ -2,7 +2,7 @@
pkgname=fish
pkgver=3.7.1
pkgrel=3
pkgrel=4
epoch=
pkgdesc='Smart and user friendly shell intended mostly for interactive use'
arch=('i686' 'x86_64')
@ -21,15 +21,24 @@ source=("https://github.com/fish-shell/fish-shell/releases/download/${pkgver}/${
config.fish
msys2.fish
msystem.fish
perlbin.fish)
perlbin.fish
0001-cmake-4-backport.patch)
sha256sums=('614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250'
'SKIP'
'983c3273e0249957ed6c40785e005739da30f31d4f029383f257f9990d38811a'
'8bb0d28df47b66e6785f7db00a2c4316bc15960e67bdec0daca7f811f5bf3895'
'b1a7b7b4238170373dd8acdc36bcbd1fc3978b3525403b877576139d6090e30d'
'b136a9fa94abf53e302f7a1cc28def03b58dd2326990c5f02ceb4988341a5ac6')
'b136a9fa94abf53e302f7a1cc28def03b58dd2326990c5f02ceb4988341a5ac6'
'5b6168131d30cf0f4a5b39b1e8728eb882414586792101e571879d92efcaac5c')
validpgpkeys=('003837986104878835FA516D7A67D962D88A709A') # David Adam <zanchey@gmail.com>
prepare() {
cd "${pkgname}-${pkgver}"
# https://github.com/fish-shell/fish-shell/issues/11116
patch -p1 < "${srcdir}/0001-cmake-4-backport.patch"
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@ -41,14 +50,13 @@ build() {
-DCMAKE_BUILD_TYPE=None \
-Wno-dev
make -C build VERBOSE=1
cmake --build build
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}/build"
rm -rf "${srcdir}/${pkgname}-${pkgver}/build/user_doc"
make DESTDIR="${pkgdir}" install
DESTDIR="${pkgdir}" cmake --install .
install -D -m644 "${srcdir}/config.fish" "${pkgdir}/etc/fish/config.fish"
install -D -m644 "${srcdir}/msys2.fish" "${pkgdir}/etc/fish/msys2.fish"