From ddce40b3f07d2e5604fb4659e1ec5980a49f4a1f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 23 Jan 2019 09:38:57 -0200 Subject: [PATCH] readline: update to 8.0.0. --- .../readline-6.2-fix-shlib-perms.patch | 11 ---- srcpkgs/readline/template | 62 +++---------------- srcpkgs/readline/update | 3 - 3 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/readline/patches/readline-6.2-fix-shlib-perms.patch delete mode 100644 srcpkgs/readline/update diff --git a/srcpkgs/readline/patches/readline-6.2-fix-shlib-perms.patch b/srcpkgs/readline/patches/readline-6.2-fix-shlib-perms.patch deleted file mode 100644 index 625ce9a2e9..0000000000 --- a/srcpkgs/readline/patches/readline-6.2-fix-shlib-perms.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- support/shlib-install.orig 2013-03-26 02:48:09.724069139 +0400 -+++ support/shlib-install 2013-03-26 02:48:19.530946536 +0400 -@@ -72,7 +72,7 @@ - case "$host_os" in - hpux*|darwin*|macosx*|linux*) - if [ -z "$uninstall" ]; then -- chmod 555 ${INSTALLDIR}/${LIBNAME} -+ chmod 644 ${INSTALLDIR}/${LIBNAME} - fi ;; - cygwin*|mingw*) - IMPLIBNAME=`echo ${LIBNAME} \ diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 5ff133392c..e15942902e 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -1,56 +1,10 @@ # Template file for 'readline' pkgname=readline -_dist_ver=7.0 -_patch_ver=005 -version="${_dist_ver}.${_patch_ver}" -revision=2 -bootstrap=yes -wrksrc="${pkgname}-${_dist_ver}" -build_style=gnu-configure -configure_args="--with-curses --enable-multibyte" -makedepends="ncurses-devel" -short_desc="The GNU Readline Library" -maintainer="Juan RP " -license="GPL-3.0-or-later" -homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html" -distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_dist_ver}.tar.gz" -checksum=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 - -pre_configure() { - local url="${GNU_SITE}/$pkgname/$pkgname-${_dist_ver}-patches" - - cd ${XBPS_SRCDISTDIR}/${pkgname}-${version} - if [ "${_patch_ver}" -gt 000 ]; then - for p in $(seq -w 001 ${_patch_ver}); do - if [ -f readline${version/./}-${p} ]; then - continue - fi - local patch_url="${url}/readline${_dist_ver/./}-${p}" - msg_normal " Fetching ${patch_url} ...\n" - $XBPS_FETCH_CMD "${patch_url}" - done - fi - 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" - done - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf -} -do_build() { - make ${makejobs} LDFLAGS="-lncurses" SHLIB_LIBS="-lncurses" -} -do_install() { - make DESTDIR=${DESTDIR} LDFLAGS="-lncurses" SHLIB_LIBS="-lncurses" install -} - -readline-devel_package() { - depends="ncurses-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/share - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - } -} +version=8.0.0 +revision=1 +build_style=meta +depends="libreadline8 libhistory8" +short_desc="Readline meta package" +maintainer="maxice8 " +license="Public Domain" +homepage="https://www.voidlinux.org" diff --git a/srcpkgs/readline/update b/srcpkgs/readline/update deleted file mode 100644 index 034db99ab5..0000000000 --- a/srcpkgs/readline/update +++ /dev/null @@ -1,3 +0,0 @@ -site="https://git.savannah.gnu.org/cgit/readline.git" -pattern="(readline-\K[\d.]+(?=\.tar.gz))|(Readline-\K[\d.]+ patch \d+)" -version="${_dist_ver} patch ${_patch_ver}"