fish: update from 2.4.0 to 2.5.0

add tarball checksum remove patches no longer needed see fish-shell/fish-shell#3585
vishalbiswas · Feb 12, 2017 · be1b0ba · be1b0ba
1 parent f8abd2b
commit be1b0ba
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 68 deletions.
diff --git a/packages/fish/build.sh b/packages/fish/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
-TERMUX_PKG_VERSION=2.4.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=2.5.0
 TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5
 # 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.
 TERMUX_PKG_DEPENDS="ncurses, libandroid-support, ncurses-utils, man"

diff --git a/packages/fish/configure.ac.patch b/packages/fish/configure.ac.patch
diff --git a/packages/fish/share-functions-__fish_print_help.fish.patch b/packages/fish/share-functions-__fish_print_help.fish.patch
@@ -1,20 +1,19 @@
-diff -u -r ../fish-2.4b1/share/functions/__fish_print_help.fish ./share/functions/__fish_print_help.fish
---- ../fish-2.4b1/share/functions/__fish_print_help.fish	2016-10-18 10:17:06.000000000 -0400
-+++ ./share/functions/__fish_print_help.fish	2016-10-19 17:37:08.948931562 -0400
-@@ -40,7 +40,7 @@
- 		set rLL -rLL=$cols[1]n
- 	end
+--- ./share/functions/__fish_print_help.fish	2017-02-03 07:16:58.000000000 +0530
++++ ../__fish_print_help.fish	2017-02-12 11:36:23.477232262 +0530
+@@ -41,7 +41,7 @@
+     end
+     set -lx GROFF_TMAC_PATH $__fish_datadir/groff
      if test -e "$__fish_datadir/man/man1/$item.1"
--	    set help (nroff -man -c -t $rLL "$__fish_datadir/man/man1/$item.1" ^/dev/null)
-+	    set help (mandoc "$__fish_datadir/man/man1/$item.1" ^/dev/null)
+-        set help (nroff -c -man -mfish -t $rLL "$__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"
- 	    set help (gunzip -c "$__fish_datadir/man/man1/$item.1.gz" ^/dev/null | nroff -man -c -t $rLL ^/dev/null)
+         set help (gunzip -c "$__fish_datadir/man/man1/$item.1.gz" ^/dev/null | nroff -c -man -mfish -t $rLL ^/dev/null)
      end
-@@ -98,6 +98,6 @@
- 				# skip it
- 			end
- 		end
--	end | ul # post-process with `ul`, to interpret the old-style grotty escapes
-+	end # post-process with `ul`, to interpret the old-style grotty escapes
- 	echo # print a trailing blank line
+@@ -99,6 +99,6 @@
+                         # skip it
+                 end
+         end
+-    end | ul # post-process with `ul`, to interpret the old-style grotty escapes
++    end # post-process with `ul`, to interpret the old-style grotty escapes
+     echo # print a trailing blank line
  end
diff --git a/packages/fish/src-env_universal_common.cpp.patch b/packages/fish/src-env_universal_common.cpp.patch
@@ -10,41 +10,3 @@ diff -u -r ../fish-2.4b1/src/env_universal_common.cpp ./src/env_universal_common
          tmpdir.append(uname);
          if (check_runtime_path(tmpdir.c_str()) != 0) {
              debug(0,
-@@ -987,6 +987,7 @@
-     return result;
- }
-
-+#ifndef __ANDROID__
- class universal_notifier_shmem_poller_t : public universal_notifier_t {
-     // This is what our shared memory looks like. Everything here is stored in network byte order
-     // (big-endian).
-@@ -1127,6 +1128,7 @@
-         return usec_per_sec / 3;  // 3 times a second
-     }
- };
-+#endif
-
- /// A notifyd-based notifier. Very straightforward.
- class universal_notifier_notifyd_t : public universal_notifier_t {
-@@ -1410,7 +1412,9 @@
-         const char *name;
-         universal_notifier_t::notifier_strategy_t strat;
-     } options[] = {{"default", universal_notifier_t::strategy_default},
-+#ifndef __ANDROID__
-                    {"shmem", universal_notifier_t::strategy_shmem_polling},
-+#endif
-                    {"pipe", universal_notifier_t::strategy_named_pipe},
-                    {"notifyd", universal_notifier_t::strategy_notifyd}};
-     const size_t opt_count = sizeof options / sizeof *options;
-@@ -1463,9 +1467,11 @@
-         strat = resolve_default_strategy();
-     }
-     switch (strat) {
-+#ifndef __ANDROID__
-         case strategy_shmem_polling: {
-             return new universal_notifier_shmem_poller_t();
-         }
-+#endif
-         case strategy_notifyd: {
-             return new universal_notifier_notifyd_t();
-         }