From d2f887a96c798969f0d7c6d96669fd3b795a4118 Mon Sep 17 00:00:00 2001 From: Yuvraj Saxena Date: Wed, 20 Feb 2019 20:24:46 +0530 Subject: [PATCH] readline: Update from 7.0 to 8.0 Signed-off-by: Yuvraj Saxena --- packages/readline/build.sh | 32 ++++-------------------- packages/readline/rlconf.h.patch | 11 ++++++++ packages/readline/sys_inputrc_path.patch | 11 -------- 3 files changed, 16 insertions(+), 38 deletions(-) create mode 100644 packages/readline/rlconf.h.patch delete mode 100644 packages/readline/sys_inputrc_path.patch diff --git a/packages/readline/build.sh b/packages/readline/build.sh index d60ed6ea2..4b45f22a5 100644 --- a/packages/readline/build.sh +++ b/packages/readline/build.sh @@ -1,36 +1,14 @@ -TERMUX_PKG_HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html +TERMUX_PKG_HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html" TERMUX_PKG_DESCRIPTION="Library that allow users to edit command lines as they are typed in" -TERMUX_PKG_LICENSE="GPL-2.0" +TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_DEPENDS="libandroid-support, ncurses" -_MAIN_VERSION=7.0 -_PATCH_VERSION=5 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 -TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION} -TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/readline/readline-${_MAIN_VERSION}.tar.gz +TERMUX_PKG_VERSION="8.0" +TERMUX_PKG_SHA256=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461 +TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/readline/readline-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-curses --enable-multibyte bash_cv_wcwidth_broken=no" TERMUX_PKG_EXTRA_MAKE_ARGS="SHLIB_LIBS=-lncursesw" TERMUX_PKG_CONFFILES="etc/inputrc" -termux_step_pre_configure() { - local PATCH_CHECKSUMS - PATCH_CHECKSUMS[1]=9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376 - PATCH_CHECKSUMS[2]=8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58 - PATCH_CHECKSUMS[3]=9e43aa93378c7e9f7001d8174b1beb948deefa6799b6f581673f465b7d9d4780 - PATCH_CHECKSUMS[4]=f925683429f20973c552bff6702c74c58c2a38ff6e5cf305a8e847119c5a6b64 - PATCH_CHECKSUMS[5]=ca159c83706541c6bbe39129a33d63bbd76ac594303f67e4d35678711c51b753 - for patch_number in $(seq -f '%03g' ${_PATCH_VERSION}); do - PATCHFILE=$TERMUX_PKG_CACHEDIR/readline_patch_${patch_number}.patch - termux_download \ - "https://mirrors.kernel.org/gnu/readline/readline-7.0-patches/readline70-$patch_number" \ - $PATCHFILE \ - ${PATCH_CHECKSUMS[patch_number]} - patch -p0 -i $PATCHFILE - done - - CFLAGS+=" -fexceptions" -} - termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/lib/pkgconfig cp readline.pc $TERMUX_PREFIX/lib/pkgconfig/ diff --git a/packages/readline/rlconf.h.patch b/packages/readline/rlconf.h.patch new file mode 100644 index 000000000..03156a5a5 --- /dev/null +++ b/packages/readline/rlconf.h.patch @@ -0,0 +1,11 @@ +--- readline-8.0/rlconf.h 2017-02-21 20:55:30.000000000 +0530 ++++ readline-8.0-mod/rlconf.h 2019-02-20 20:45:45.583654990 +0530 +@@ -43,7 +43,7 @@ + #define DEFAULT_INPUTRC "~/.inputrc" + + /* The ultimate last-ditch filename for an init file -- system-wide. */ +-#define SYS_INPUTRC "/etc/inputrc" ++#define SYS_INPUTRC "@TERMUX_PREFIX@/etc/inputrc" + + /* If defined, expand tabs to spaces. */ + #define DISPLAY_TABS diff --git a/packages/readline/sys_inputrc_path.patch b/packages/readline/sys_inputrc_path.patch deleted file mode 100644 index 4d54db9fc..000000000 --- a/packages/readline/sys_inputrc_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../readline-6.2/rlconf.h 2009-01-04 20:32:33.000000000 +0100 -+++ ./rlconf.h 2014-02-04 18:30:16.000000000 +0100 -@@ -39,7 +39,7 @@ - #define DEFAULT_INPUTRC "~/.inputrc" - - /* The ultimate last-ditch filenname for an init file -- system-wide. */ --#define SYS_INPUTRC "/etc/inputrc" -+#define SYS_INPUTRC "@TERMUX_PREFIX@/etc/inputrc" - - /* If defined, expand tabs to spaces. */ - #define DISPLAY_TABS