fish: Update to 3.4.0
This commit is contained in:
parent
33354fdc39
commit
c5ff038fa7
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://fishshell.com/
|
||||
TERMUX_PKG_DESCRIPTION="The user-friendly command line shell"
|
||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=3.3.1
|
||||
TERMUX_PKG_REVISION=4
|
||||
TERMUX_PKG_VERSION=3.4.0
|
||||
TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89
|
||||
TERMUX_PKG_SHA256=b5b48ab8486b19ef716a32f7f46b88b9ea5356155f0e967ee99f4093645413c5
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line.
|
||||
# man is needed since fish calls apropos during command completion.
|
||||
|
@ -12,12 +12,12 @@ An example of this:-
|
||||
This can cause weird bugs when a script tries to execute with hardcoded paths, it might get errors about command not found even if it exists, because fish is checking it at the wrong place.
|
||||
|
||||
This patch has been tested to fix the bug
|
||||
--- ./src/path.cpp.orig 2021-12-08 12:51:35.296728931 +0530
|
||||
+++ ./src/path.cpp 2021-12-08 12:57:44.166728790 +0530
|
||||
@@ -38,10 +38,20 @@
|
||||
|
||||
static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
|
||||
const maybe_t<env_var_t> &bin_path_var) {
|
||||
--- a/src/path.cpp
|
||||
+++ b/src/path.cpp
|
||||
@@ -42,10 +42,20 @@ static bool path_get_path_core(const wcs
|
||||
// If we let this through, we'd end up checking up to the NULL,
|
||||
// so we'd get the wrong path.
|
||||
if (cmd.find(L'\0') != wcstring::npos) return false;
|
||||
+ // Map /bin and /usr/bin to @TERMUX_PREFIX@
|
||||
+ wcstring _cmd;
|
||||
+
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -u -r ../fish-2.6.0/src/wutil.cpp ./src/wutil.cpp
|
||||
--- ../fish-2.6.0/src/wutil.cpp 2017-06-03 14:45:13.000000000 +0200
|
||||
+++ ./src/wutil.cpp 2017-07-13 22:31:47.791569324 +0200
|
||||
@@ -290,7 +290,7 @@
|
||||
// have to grub through sys_nerr and sys_errlist directly On GNU toolchain, this will produce a
|
||||
// deprecation warning from the linker (!!), which appears impossible to suppress!
|
||||
const char *safe_strerror(int err) {
|
||||
-#if defined(__UCLIBC__)
|
||||
+#if defined(__UCLIBC__) || defined(__ANDROID__)
|
||||
// uClibc does not have sys_errlist, however, its strerror is believed to be async-safe.
|
||||
// See issue #808.
|
||||
return strerror(err);
|
Loading…
Reference in New Issue
Block a user