From 906413fae020cf874ae608c61e3d805b61f49d32 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 13 Feb 2019 23:35:18 +0100 Subject: [PATCH] fish: Update from 3.0.0 to 3.0.1 --- packages/fish/build.sh | 4 ++-- packages/fish/src-env.cpp.patch | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/fish/build.sh b/packages/fish/build.sh index 439b0b655..5ef15d53f 100644 --- a/packages/fish/build.sh +++ b/packages/fish/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://fishshell.com/ TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=3.0.0 -TERMUX_PKG_SHA256=ea9dd3614bb0346829ce7319437c6a93e3e1dfde3b7f6a469b543b0d2c68f2cf +TERMUX_PKG_VERSION=3.0.1 +TERMUX_PKG_SHA256=21677a5755ee1738bad2cf8179c104068f8bb81b969660d5a2af4ba6eceba5e4 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/src-env.cpp.patch b/packages/fish/src-env.cpp.patch index 16676d1c7..4ebc2bd59 100644 --- a/packages/fish/src-env.cpp.patch +++ b/packages/fish/src-env.cpp.patch @@ -1,12 +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; +diff -u -r ../fish-3.0.1/src/env.cpp ./src/env.cpp +--- ../fish-3.0.1/src/env.cpp 2019-02-11 12:13:15.000000000 +0000 ++++ ./src/env.cpp 2019-02-13 22:19:56.975817836 +0000 +@@ -1663,7 +1663,7 @@ + auto pwuid = getpwuid(geteuid()); + const char *uname = pwuid ? pwuid->pw_name : NULL; // /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) { + if (uname) { + tmpdir.append(uname); + }