From 0de77aec34aedec6eb760d0cd070be53c5d9b873 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Mon, 9 Jan 2023 05:31:01 +0000 Subject: [PATCH] fish: Bump to 3.6.0 --- packages/fish/build.sh | 5 ++--- packages/fish/src-path.cpp.patch | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/fish/build.sh b/packages/fish/build.sh index b64e252b90..615a5f7d78 100644 --- a/packages/fish/build.sh +++ b/packages/fish/build.sh @@ -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.5.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=3.6.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=a6d45b3dc5a45dd31772e7f8dfdfecabc063986e8f67d60bd7ca60cc81db6928 +TERMUX_PKG_SHA256=97044d57773ee7ca15634f693d917ed1c3dc0fa7fde1017f1626d60b83ea6181 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. diff --git a/packages/fish/src-path.cpp.patch b/packages/fish/src-path.cpp.patch index fd7a065e02..c5ba1178c1 100644 --- a/packages/fish/src-path.cpp.patch +++ b/packages/fish/src-path.cpp.patch @@ -20,12 +20,12 @@ index d5a649e0e..ad4e84278 100644 #include "wutil.h" // IWYU pragma: keep // PREFIX is defined at build time. --const wcstring_list_t kDefaultPath({L"/bin", L"/usr/bin", PREFIX L"/bin"}); -+const wcstring_list_t kDefaultPath({PREFIX L"/bin"}); +-static const wcstring_list_t kDefaultPath({L"/bin", L"/usr/bin", PREFIX L"/bin"}); ++static const wcstring_list_t kDefaultPath({PREFIX L"/bin"}); - static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_list_t &pathsv, - const environment_t &vars) { -@@ -53,10 +53,18 @@ static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_ + static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_list_t &pathsv) { + const get_path_result_t noent_res{ENOENT, wcstring{}}; +@@ -52,11 +52,19 @@ static get_path_result_t path_get_path_c return noent_res; } @@ -40,12 +40,14 @@ index d5a649e0e..ad4e84278 100644 // If the command has a slash, it must be an absolute or relative path and thus we don't bother // looking for a matching command. - if (cmd.find(L'/') != wcstring::npos) { -- wcstring abs_cmd = path_apply_working_directory(cmd, vars.get_pwd_slash()); +- int merr = test_path(cmd); +- return get_path_result_t{merr, cmd}; + if (_cmd.find(L'/') != wcstring::npos) { -+ wcstring abs_cmd = path_apply_working_directory(_cmd, vars.get_pwd_slash()); - int merr = test_path(abs_cmd); - return get_path_result_t{merr, std::move(abs_cmd)}; ++ int merr = test_path(_cmd); ++ return get_path_result_t{merr, _cmd}; } + + get_path_result_t best = noent_res; @@ -66,7 +74,7 @@ static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_ for (const auto &next_path : pathsv) { if (next_path.empty()) continue;