From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 2 Oct 2015 08:33:54 +0000 (-0400)
Subject: fish: Update package to latest master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/3e9c81f21ec084252633a0199def7f7f58f720a1?ds=inline

fish: Update package to latest master
---

diff --git a/packages/fish/Makefile.in.patch b/packages/fish/Makefile.in.patch
deleted file mode 100644
index 76e55d8e..00000000
--- a/packages/fish/Makefile.in.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../fish-shell-master/Makefile.in ./Makefile.in
---- ../fish-shell-master/Makefile.in	2015-09-30 09:14:09.000000000 -0400
-+++ ./Makefile.in	2015-09-30 18:30:13.271683017 -0400
-@@ -59,7 +59,7 @@
- PCRE2_LIBDIR = $(PCRE2_DIR)/.libs
- PCRE2_LIB = $(PCRE2_LIBDIR)/libpcre2-$(PCRE2_WIDTH).a
- PCRE2_H = $(PCRE2_DIR)/src/pcre2.h
--PCRE2_CONFIG = --disable-pcre2-8 --enable-pcre2-$(PCRE2_WIDTH) --disable-shared
-+PCRE2_CONFIG = --disable-pcre2-8 --enable-pcre2-$(PCRE2_WIDTH) --disable-shared $(PCRE2_CONFIG_EXTRAS)
- 
- #
- # Various flags
diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index bc2d8229..50744722 100644
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
 TERMUX_PKG_VERSION=2.2.0.`date "+%Y%m%d%H%M"`
 # TERMUX_PKG_SRCURL=http://fishshell.com/files/${TERMUX_PKG_VERSION}/fish-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/archive/master.zip
+TERMUX_PKG_NO_SRC_CACHE=yes
 TERMUX_PKG_DEPENDS="ncurses, libgnustl, libandroid-support"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_FOLDERNAME=fish-shell-master
diff --git a/packages/fish/exec.cpp.patch b/packages/fish/exec.cpp.patch
deleted file mode 100644
index e5d7961f..00000000
--- a/packages/fish/exec.cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r ../fish-shell-master/src/exec.cpp ./src/exec.cpp
---- ../fish-shell-master/src/exec.cpp	2015-09-30 09:14:09.000000000 -0400
-+++ ./src/exec.cpp	2015-09-30 18:13:06.563764498 -0400
-@@ -18,7 +18,9 @@
- #include <assert.h>
- #include <vector>
- #include <algorithm>
-+#ifdef FISH_USE_POSIX_SPAWN
- #include <spawn.h>
-+#endif
- #include <wctype.h>
- #include <map>
- #include <string>