Skip to content

Commit

Permalink
libreadline8: update to 8.2.001.
Browse files Browse the repository at this point in the history
Closes: void-linux#42170 [via git-merge-pr]
  • Loading branch information
triallax authored and sirkhancision committed Jun 11, 2023
1 parent c37cc84 commit b8afe2f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 46 deletions.
42 changes: 1 addition & 41 deletions srcpkgs/libreadline8/patches/no-rpath-and-link.patch
Expand Up @@ -4,49 +4,9 @@ Date: Thu, 5 Nov 2020 02:49:21 +0100
Subject: [PATCH] drop rpath and link against the termcap library

---
configure | 8 ++++----
configure.ac | 8 ++++----
support/shobj-conf | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
1 file changed, 1 insertions(+), 1 deletions(-)

diff --git configure configure
index 7d7bce0..eff4e76 100755
--- a/configure
+++ b/configure
@@ -6823,10 +6823,10 @@ if test -f ${srcdir}/support/shobj-conf; then
$as_echo_n "checking configuration for building shared libraries... " >&6; }
eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`

-# case "$SHLIB_LIBS" in
-# *curses*|*termcap*|*termlib*) ;;
-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-# esac
+ case "$SHLIB_LIBS" in
+ *curses*|*termcap*|*termlib*) ;;
+ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
+ esac



diff --git configure.ac configure.ac
index db788a6..9ac3eef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,10 +227,10 @@ if test -f ${srcdir}/support/shobj-conf; then
AC_MSG_CHECKING(configuration for building shared libraries)
eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`

-# case "$SHLIB_LIBS" in
-# *curses*|*termcap*|*termlib*) ;;
-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-# esac
+ case "$SHLIB_LIBS" in
+ *curses*|*termcap*|*termlib*) ;;
+ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
+ esac

AC_SUBST(SHOBJ_CC)
AC_SUBST(SHOBJ_CFLAGS)
diff --git support/shobj-conf support/shobj-conf
index 7920f1b..7ac9c9f 100644
--- a/support/shobj-conf
Expand Down
15 changes: 10 additions & 5 deletions srcpkgs/libreadline8/template
@@ -1,25 +1,30 @@
# Template file for 'libreadline8'
pkgname=libreadline8
version=8.1.000
version=8.2.001
revision=1
_dist_ver="${version%.*}"
_patch_ver="${version##*.}"
bootstrap=yes
build_style=gnu-configure
configure_args="--with-curses --enable-multibyte bash_cv_termcap_lib=libncursesw"
configure_args="--with-curses --with-shared-termcap-library --enable-multibyte
bash_cv_termcap_lib=libncursesw"
makedepends="ncurses-devel"
short_desc="GNU Readline Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz"
checksum=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
changelog="https://tiswww.cwru.edu/php/chet/readline/NEWS"
distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz
${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-001"
checksum="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7"
skip_extraction="readline${_dist_ver/./}-001"

post_patch() {
cd ${wrksrc}
for p in $(seq -w 001 ${_patch_ver}); do
patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p}
msg_normal " Applying patch readline${_dist_ver/./}-$p.\n"
msg_normal "Applying patch readline${_dist_ver/./}-$p.\n"
done
}

Expand Down

0 comments on commit b8afe2f

Please sign in to comment.