lukechilds
/
termux-packages
mirror of https://github.com/lukechilds/termux-packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fish: Update from 2.7.1 to 3.0.0

android-5
Fredrik Fornwall 6 years ago
parent
ccd660e4f3
commit
9a8ba20e46
7 changed files with 38 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      packages/fish/build.sh
  2. 21
      packages/fish/create_manpage_completions.py.patch
  3. 18
      packages/fish/share-functions-__fish_print_help.fish.patch
  4. 12
      packages/fish/src-builtin_argparse.cpp.patch
  5. 14
      packages/fish/src-common.h.patch
  6. 12
      packages/fish/src-env.cpp.patch
  7. 12
      packages/fish/src-env_universal_common.cpp.patch

5
packages/fish/build.sh
View File

@ -1,8 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://fishshell.com/ TERMUX_PKG_HOMEPAGE=https://fishshell.com/
TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use" TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
TERMUX_PKG_VERSION=2.7.1 TERMUX_PKG_VERSION=3.0.0
TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=ea9dd3614bb0346829ce7319437c6a93e3e1dfde3b7f6a469b543b0d2c68f2cf
TERMUX_PKG_SHA256=e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a
TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz 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. # 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. # man is needed since fish calls apropos during command completion.

21
packages/fish/create_manpage_completions.py.patch
View File

@ -1,12 +1,11 @@
diff -u -r ../fish-2.6.0/share/tools/create_manpage_completions.py ./share/tools/create_manpage_completions.py diff -u -r ../fish-3.0.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 --- ../fish-3.0.0/share/tools/create_manpage_completions.py 2018-12-28 13:01:03.000000000 +0000
+++ ./share/tools/create_manpage_completions.py 2017-06-05 21:27:41.796125049 +0200 +++ ./share/tools/create_manpage_completions.py 2018-12-28 22:54:12.034220150 +0000
@@ -862,22 +862,7 @@ @@ -865,29 +865,7 @@
if os.getenv("MANPATH"): if os.getenv("MANPATH"):
parent_paths = os.getenv("MANPATH").strip().split(':') parent_paths = os.getenv("MANPATH").strip().split(':')
else: else:
- # Some systems have manpath, others have `man --path` (like Haiku). - # Some systems have manpath, others have `man --path` (like Haiku).
- # TODO: Deal with systems that have neither (OpenBSD)
- for prog in [['manpath'], ['man', '--path']]: - for prog in [['manpath'], ['man', '--path']]:
- try: - try:
- proc = subprocess.Popen(prog, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - proc = subprocess.Popen(prog, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -16,9 +15,17 @@ diff -u -r ../fish-2.6.0/share/tools/create_manpage_completions.py ./share/tools
- manpath, err_data = proc.communicate() - manpath, err_data = proc.communicate()
- parent_paths = manpath.decode().strip().split(':') - parent_paths = manpath.decode().strip().split(':')
- if (not parent_paths) or (proc and proc.returncode > 0): - if (not parent_paths) or (proc and proc.returncode > 0):
- # HACK: Use some fallback in case we can't get anything else. - # 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, so just use the default for mandoc (minus /usr/X11R6/man, because that's not relevant). - # `mandoc` does not provide `manpath` or `man --path` and $MANPATH might not be set.
- # The alternative is reading its config file (/etc/man.conf) - # The alternative is reading its config file (/etc/man.conf)
- 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") - 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 = ["/usr/share/man", "/usr/local/share/man"]
+ parent_paths = ["@TERMUX_PREFIX@/share/man"] + parent_paths = ["@TERMUX_PREFIX@/share/man"]

18
packages/fish/share-functions-__fish_print_help.fish.patch
View File

@ -1,16 +1,16 @@
diff -u -r ../fish-2.6.0/share/functions/__fish_print_help.fish ./share/functions/__fish_print_help.fish diff -u -r ../fish-3.0.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 --- ../fish-3.0.0/share/functions/__fish_print_help.fish 2018-12-28 13:01:03.000000000 +0000
+++ ./share/functions/__fish_print_help.fish 2017-06-05 21:29:51.794696261 +0200 +++ ./share/functions/__fish_print_help.fish 2018-12-28 22:55:42.761223014 +0000
@@ -45,7 +45,7 @@ @@ -22,7 +22,7 @@
set mfish -mfish set mfish -mfish
end end
if test -e "$__fish_datadir/man/man1/$item.1" if test -e "$__fish_data_dir/man/man1/$item.1"
- set help (nroff -c -man $mfish -t $rLL "$__fish_datadir/man/man1/$item.1" ^/dev/null) - 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) + set help (mandoc "$__fish_datadir/man/man1/$item.1" ^/dev/null)
else if test -e "$__fish_datadir/man/man1/$item.1.gz" else if test -e "$__fish_data_dir/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) 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 end
@@ -103,6 +103,6 @@ @@ -80,6 +80,6 @@
# skip it # skip it
end end
end end

12
packages/fish/src-builtin_argparse.cpp.patch
View File

@ -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};

14
packages/fish/src-common.h.patch
View File

@ -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

12
packages/fish/src-env.cpp.patch
View File

@ -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) {

12
packages/fish/src-env_universal_common.cpp.patch
View File

@ -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,
Write Preview
Loading…
Cancel
Save