From 230210ee6c77024712b8871370ea1556d0c37c72 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 29 Dec 2018 00:07:13 +0100 Subject: [PATCH] fish: Update from 2.7.1 to 3.0.0 --- packages/fish/build.sh | 5 ++-- .../fish/create_manpage_completions.py.patch | 23 ++++++++++++------- ...are-functions-__fish_print_help.fish.patch | 18 +++++++-------- packages/fish/src-builtin_argparse.cpp.patch | 12 ---------- packages/fish/src-common.h.patch | 14 ----------- packages/fish/src-env.cpp.patch | 12 ++++++++++ .../fish/src-env_universal_common.cpp.patch | 12 ---------- 7 files changed, 38 insertions(+), 58 deletions(-) delete mode 100644 packages/fish/src-builtin_argparse.cpp.patch delete mode 100644 packages/fish/src-common.h.patch create mode 100644 packages/fish/src-env.cpp.patch delete mode 100644 packages/fish/src-env_universal_common.cpp.patch diff --git a/packages/fish/build.sh b/packages/fish/build.sh index ce02b8f96..70d88c36a 100644 --- a/packages/fish/build.sh +++ b/packages/fish/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://fishshell.com/ TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use" -TERMUX_PKG_VERSION=2.7.1 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a +TERMUX_PKG_VERSION=3.0.0 +TERMUX_PKG_SHA256=ea9dd3614bb0346829ce7319437c6a93e3e1dfde3b7f6a469b543b0d2c68f2cf TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz # 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/create_manpage_completions.py.patch b/packages/fish/create_manpage_completions.py.patch index f7a8dd277..6bf114dda 100644 --- a/packages/fish/create_manpage_completions.py.patch +++ b/packages/fish/create_manpage_completions.py.patch @@ -1,12 +1,11 @@ -diff -u -r ../fish-2.6.0/share/tools/create_manpage_completions.py ./share/tools/create_manpage_completions.py ---- ../fish-2.6.0/share/tools/create_manpage_completions.py 2017-06-03 14:45:13.000000000 +0200 -+++ ./share/tools/create_manpage_completions.py 2017-06-05 21:27:41.796125049 +0200 -@@ -862,22 +862,7 @@ +diff -u -r ../fish-3.0.0/share/tools/create_manpage_completions.py ./share/tools/create_manpage_completions.py +--- ../fish-3.0.0/share/tools/create_manpage_completions.py 2018-12-28 13:01:03.000000000 +0000 ++++ ./share/tools/create_manpage_completions.py 2018-12-28 22:54:12.034220150 +0000 +@@ -865,29 +865,7 @@ if os.getenv("MANPATH"): parent_paths = os.getenv("MANPATH").strip().split(':') else: - # Some systems have manpath, others have `man --path` (like Haiku). -- # TODO: Deal with systems that have neither (OpenBSD) - for prog in [['manpath'], ['man', '--path']]: - try: - proc = subprocess.Popen(prog, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -16,10 +15,18 @@ diff -u -r ../fish-2.6.0/share/tools/create_manpage_completions.py ./share/tools - manpath, err_data = proc.communicate() - parent_paths = manpath.decode().strip().split(':') - if (not parent_paths) or (proc and proc.returncode > 0): -- # HACK: Use some fallback in case we can't get anything else. -- # `mandoc` does not provide `manpath` or `man --path` and $MANPATH might not be set, so just use the default for mandoc (minus /usr/X11R6/man, because that's not relevant). +- # HACK: Use some fallbacks in case we can't get anything else. +- # `mandoc` does not provide `manpath` or `man --path` and $MANPATH might not be set. - # The alternative is reading its config file (/etc/man.conf) -- sys.stderr.write("Unable to get the manpath, falling back to /usr/share/man:/usr/local/share/man. Please set $MANPATH if that is not correct.\n") +- if os.path.isfile('/etc/man.conf'): +- data = open('/etc/man.conf', 'r') +- for line in data: +- if ('manpath' in line or 'MANPATH' in line): +- p = line.split(' ')[1] +- p = p.split()[0] +- parent_paths.append(p) +- if (not parent_paths): +- sys.stderr.write("Unable to get the manpath, falling back to /usr/share/man:/usr/local/share/man. Please set $MANPATH if that is not correct.\n") - parent_paths = ["/usr/share/man", "/usr/local/share/man"] + parent_paths = ["@TERMUX_PREFIX@/share/man"] result = [] diff --git a/packages/fish/share-functions-__fish_print_help.fish.patch b/packages/fish/share-functions-__fish_print_help.fish.patch index e0e196fb6..5319fd735 100644 --- a/packages/fish/share-functions-__fish_print_help.fish.patch +++ b/packages/fish/share-functions-__fish_print_help.fish.patch @@ -1,16 +1,16 @@ -diff -u -r ../fish-2.6.0/share/functions/__fish_print_help.fish ./share/functions/__fish_print_help.fish ---- ../fish-2.6.0/share/functions/__fish_print_help.fish 2017-06-03 14:45:13.000000000 +0200 -+++ ./share/functions/__fish_print_help.fish 2017-06-05 21:29:51.794696261 +0200 -@@ -45,7 +45,7 @@ +diff -u -r ../fish-3.0.0/share/functions/__fish_print_help.fish ./share/functions/__fish_print_help.fish +--- ../fish-3.0.0/share/functions/__fish_print_help.fish 2018-12-28 13:01:03.000000000 +0000 ++++ ./share/functions/__fish_print_help.fish 2018-12-28 22:55:42.761223014 +0000 +@@ -22,7 +22,7 @@ set mfish -mfish end - if test -e "$__fish_datadir/man/man1/$item.1" -- set help (nroff -c -man $mfish -t $rLL "$__fish_datadir/man/man1/$item.1" ^/dev/null) + if test -e "$__fish_data_dir/man/man1/$item.1" +- set help (nroff -c -man $mfish -t $rLL "$__fish_data_dir/man/man1/$item.1" 2>/dev/null) + set help (mandoc "$__fish_datadir/man/man1/$item.1" ^/dev/null) - else if test -e "$__fish_datadir/man/man1/$item.1.gz" - set help (gunzip -c "$__fish_datadir/man/man1/$item.1.gz" ^/dev/null | nroff -c -man $mfish -t $rLL ^/dev/null) + else if test -e "$__fish_data_dir/man/man1/$item.1.gz" + set help (gunzip -c "$__fish_data_dir/man/man1/$item.1.gz" 2>/dev/null | nroff -c -man $mfish -t $rLL 2>/dev/null) end -@@ -103,6 +103,6 @@ +@@ -80,6 +80,6 @@ # skip it end end diff --git a/packages/fish/src-builtin_argparse.cpp.patch b/packages/fish/src-builtin_argparse.cpp.patch deleted file mode 100644 index 321907258..000000000 --- a/packages/fish/src-builtin_argparse.cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../fish-2.7.0/src/builtin_argparse.cpp ./src/builtin_argparse.cpp ---- ../fish-2.7.0/src/builtin_argparse.cpp 2017-11-23 06:45:49.000000000 +0100 -+++ ./src/builtin_argparse.cpp 2017-11-30 00:33:41.800475273 +0100 -@@ -444,7 +444,7 @@ - - if (!opt_spec->long_flag.empty()) { - long_options.get()[i++] = {opt_spec->long_flag.c_str(), arg_type, NULL, -- opt_spec->short_flag}; -+ (int) opt_spec->short_flag}; - } - } - long_options.get()[i] = {NULL, 0, NULL, 0}; diff --git a/packages/fish/src-common.h.patch b/packages/fish/src-common.h.patch deleted file mode 100644 index b46bf8479..000000000 --- a/packages/fish/src-common.h.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://reviews.freebsd.org/D14058 - -diff -u -r ../fish-2.7.1/src/common.h ./src/common.h ---- ../fish-2.7.1/src/common.h 2017-12-22 16:16:29.000000000 +0000 -+++ ./src/common.h 2018-09-21 22:05:33.472645301 +0000 -@@ -658,7 +658,7 @@ - void append_format(wcstring &str, const wchar_t *format, ...); - void append_formatv(wcstring &str, const wchar_t *format, va_list ap); - --#ifdef __cpp_lib_make_unique -+#if __cplusplus >= 201402L - using std::make_unique; - #else - /// make_unique implementation diff --git a/packages/fish/src-env.cpp.patch b/packages/fish/src-env.cpp.patch new file mode 100644 index 000000000..16676d1c7 --- /dev/null +++ b/packages/fish/src-env.cpp.patch @@ -0,0 +1,12 @@ +diff -u -r ../fish-3.0.0/src/env.cpp ./src/env.cpp +--- ../fish-3.0.0/src/env.cpp 2018-12-28 13:01:03.000000000 +0000 ++++ ./src/env.cpp 2018-12-28 23:00:54.389770761 +0000 +@@ -1656,7 +1656,7 @@ + // See https://github.com/fish-shell/fish-shell/issues/5180 + const char *uname = getpwuid(geteuid())->pw_name; + // /tmp/fish.user +- std::string tmpdir = "/tmp/fish."; ++ std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish."; + tmpdir.append(uname); + + if (check_runtime_path(tmpdir.c_str()) != 0) { diff --git a/packages/fish/src-env_universal_common.cpp.patch b/packages/fish/src-env_universal_common.cpp.patch deleted file mode 100644 index f1004345f..000000000 --- a/packages/fish/src-env_universal_common.cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../fish-2.4b1/src/env_universal_common.cpp ./src/env_universal_common.cpp ---- ../fish-2.4b1/src/env_universal_common.cpp 2016-10-18 10:17:06.000000000 -0400 -+++ ./src/env_universal_common.cpp 2016-10-19 17:42:06.900520935 -0400 -@@ -137,7 +137,7 @@ - } - - // /tmp/fish.user -- std::string tmpdir = "/tmp/fish."; -+ std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish."; - tmpdir.append(uname); - if (check_runtime_path(tmpdir.c_str()) != 0) { - debug(0,