From 79c6460fe1101d1b60b8b2398d4a65988a418440 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 25 Nov 2022 07:27:45 +0900 Subject: [PATCH] rlwrap: Bump to 0.46.1 --- packages/rlwrap/build.sh | 5 ++--- packages/rlwrap/disable-bracketed-paste.patch | 12 ++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/rlwrap/build.sh b/packages/rlwrap/build.sh index dfc26d144c..9b22c55dc9 100644 --- a/packages/rlwrap/build.sh +++ b/packages/rlwrap/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/hanslub42/rlwrap TERMUX_PKG_DESCRIPTION="Wrapper using readline to enable editing of keyboard input for commands" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.45.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=0.46.1 TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/rlwrap-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=feb49c4ffa79f78d2439b4ffa933c77eed57eeb614ab84d967b8d692e0f6beb1 +TERMUX_PKG_SHA256=fa00682947fd30e97bf09af3d1feb69cb04cb60676fc23be1e266208b65241b5 TERMUX_PKG_DEPENDS="ncurses, readline" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/rlwrap/disable-bracketed-paste.patch b/packages/rlwrap/disable-bracketed-paste.patch index 039f9359b4..885e9a055f 100644 --- a/packages/rlwrap/disable-bracketed-paste.patch +++ b/packages/rlwrap/disable-bracketed-paste.patch @@ -2,12 +2,16 @@ https://github.com/termux/termux-packages/issues/12282 --- a/src/readline.c +++ b/src/readline.c -@@ -103,7 +103,7 @@ +@@ -96,10 +96,12 @@ in .inputrc */ /* put the next variable binding(s) *after* rl_initialize(), so they cannot be overridden */ -- /* rl_variable_bind("enable-bracketed-paste","off"); */ /* enable-bracketed-paste changes cursor positioning after printing the prompt ... -+ rl_variable_bind("enable-bracketed-paste","off"); /* enable-bracketed-paste changes cursor positioning after printing the prompt ... - ... causing rlwrap to overwrite it after accepting input */ ++#if 0 + if (rl_readline_version < 0x802) /* in bracketed_paste_mode rl_deprep_terminal() prints BRACK_PASTE_FINI ("\033[?2004l\r") + which moves the cursor to the beginning of the line. In pre-8.2 readline, this doesn't + set _rl_last_c_pos to 0, which makes rl_redisplay() think that it is already past the prompt, + making it overwrite the prompt that rlwrap has already printed. cf. https://github.com/hanslub42/rlwrap/issues/168 */ ++#endif + rl_variable_bind("enable-bracketed-paste","off"); using_history();