From 491c03bfc3adef3aa296367ad591d1062f4970d3 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 28 Dec 2022 15:44:10 +0900 Subject: [PATCH] hstr: Do not use `TIOCSTI` --- packages/hstr/build.sh | 1 + packages/hstr/no-TIOCSTI.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 packages/hstr/no-TIOCSTI.patch diff --git a/packages/hstr/build.sh b/packages/hstr/build.sh index 922d96df0f..8b6f26050b 100644 --- a/packages/hstr/build.sh +++ b/packages/hstr/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Shell history suggest box for bash and zsh" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/dvorka/hstr/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=085f8a087481bcdf33e75e2fa5aaa9289931782c0bee2db3e02425b9a7d83cdf TERMUX_PKG_DEPENDS="ncurses, readline" diff --git a/packages/hstr/no-TIOCSTI.patch b/packages/hstr/no-TIOCSTI.patch new file mode 100644 index 0000000000..614ae486da --- /dev/null +++ b/packages/hstr/no-TIOCSTI.patch @@ -0,0 +1,22 @@ +https://github.com/termux/termux-packages/issues/14160 + +--- a/src/hstr_utils.c ++++ b/src/hstr_utils.c +@@ -106,7 +106,7 @@ + } + } + +-#if !defined(__MS_WSL__) && !defined(__CYGWIN__) && !defined(DEBUG_NO_TIOCSTI) ++#if !defined(__MS_WSL__) && !defined(__CYGWIN__) && !defined(DEBUG_NO_TIOCSTI) && !defined(__ANDROID__) + void tiocsti() + { + char buf[] = DEFAULT_COMMAND; +@@ -120,7 +120,7 @@ + void fill_terminal_input(char* cmd, bool padding) + { + if(cmd && strlen(cmd)>0) { +-#if defined(__MS_WSL__) || defined(__CYGWIN__) || defined(DEBUG_NO_TIOCSTI) ++#if defined(__MS_WSL__) || defined(__CYGWIN__) || defined(DEBUG_NO_TIOCSTI) || defined(__ANDROID__) + fprintf(stderr, "%s", cmd); + if(padding) fprintf(stderr, "%s", "\n"); + #else