diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/fish/APKBUILD | 9 | ||||
| -rw-r--r-- | user/fish/regex-use-different-wrong-escape.patch | 13 |
2 files changed, 19 insertions, 3 deletions
diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD index 0544bd24b..a6753a0bf 100644 --- a/user/fish/APKBUILD +++ b/user/fish/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=fish pkgver=3.7.1 -pkgrel=0 +pkgrel=1 pkgdesc="Modern interactive commandline shell" url="http://www.fishshell.com" arch="all" @@ -13,7 +13,9 @@ checkdepends="py3-pexpect" makedepends="cmake doxygen ncurses-dev pcre2-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools::noarch" -source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" +source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/$pkgname-$pkgver.tar.xz + regex-use-different-wrong-escape.patch + " prepare() { default_prepare @@ -59,4 +61,5 @@ tools() { mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname } -sha512sums="f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe fish-3.7.1.tar.xz" +sha512sums="f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe fish-3.7.1.tar.xz +374a99c59d5fa8b1adabeb8532681f782f74d39ab7c8e200e2486c3dece15f4be1fca649dee7b2964681948c23023fae54b97e15e8f4a4a524bc6a6f5643999e regex-use-different-wrong-escape.patch" diff --git a/user/fish/regex-use-different-wrong-escape.patch b/user/fish/regex-use-different-wrong-escape.patch new file mode 100644 index 000000000..4e9bea5fd --- /dev/null +++ b/user/fish/regex-use-different-wrong-escape.patch @@ -0,0 +1,13 @@ +diff -Nurd fish-3.7.1/src/fish_tests.cpp fish-3.7.1.new/src/fish_tests.cpp +--- fish-3.7.1/src/fish_tests.cpp 2024-03-18 20:40:45.000000000 -0700 ++++ fish-3.7.1.new/src/fish_tests.cpp 2025-08-11 02:17:54.184887104 -0700 +@@ -7009,7 +7009,7 @@ + +- // Test with a bad escape; \b is unsupported. ++ // Test with a bad escape; \z is unsupported. + re_error_t error{}; +- res = re->substitute(subj, L"AAA\\bZZZ", sflags, 0, &error); ++ res = re->substitute(subj, L"AAA\\zZZZ", sflags, 0, &error); + do_test(!res.has_value()); + do_test(error.code == -57 /* PCRE2_ERROR_BADREPESCAPE */); + do_test(error.message() == L"bad escape sequence in replacement string"); |