X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/2d259302a9b3ecb95a2d20cfb997d3cd40362806..206fed09009fe61b88b52e96c7836f275e50bfa3:/packages/fish/build.sh

diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index 499102ab..118646f2 100644
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -1,19 +1,30 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
-_COMMIT=b1b2698a843b52ea18ae0f8fc1e5a2b6e003f409
-TERMUX_PKG_VERSION=2.2.201603181154
-TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/archive/${_COMMIT}.zip
-TERMUX_PKG_DEPENDS="ncurses, libgnustl, libandroid-support"
+TERMUX_PKG_VERSION=2.6.0
+TERMUX_PKG_REVISION=3
+TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb
+# 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, bc, pcre2"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=fish-shell-$_COMMIT
-
-termux_step_pre_configure () {
-	cd $TERMUX_PKG_SRCDIR
-	autoconf
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_file__proc_self_stat=yes
+--without-included-pcre2
+"
 
+termux_step_pre_configure() {
 	CXXFLAGS+=" $CPPFLAGS"
 
-	LDFLAGS+=" -lgnustl_shared"
+	# The column(1) utility is used by oh-my-fish, so we bundle column.c from bsdmainutils with it:
+	$CC $CFLAGS $LDFLAGS -DLINE_MAX=_POSIX2_LINE_MAX $TERMUX_PKG_BUILDER_DIR/column.c -o $TERMUX_PREFIX/bin/column
+}
+
+termux_step_post_make_install () {
+	cat >> $TERMUX_PREFIX/etc/fish/config.fish <<HERE
 
-	export PCRE2_CONFIG_EXTRAS="--host=$TERMUX_HOST_PLATFORM"
+function __fish_command_not_found_handler --on-event fish_command_not_found
+	$TERMUX_PREFIX/libexec/termux/command-not-found \$argv[1]
+end
+HERE
 }