From f4849e73fd2b689043eccccde594e85216d5a0da Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 11 Nov 2015 16:20:14 +0000 Subject: [PATCH] readline: updated to 6.3.8 and updated mandir --- readline/.footprint | 13 ++-- readline/.md5sum | 4 +- readline/Pkgfile | 15 ++-- readline/readline-6.3.6.patch.gz | Bin 2572 -> 0 bytes readline/readline-6.3.8-wcwidth.patch | 97 ++++++++++++++++++++++++++ 5 files changed, 110 insertions(+), 19 deletions(-) delete mode 100644 readline/readline-6.3.6.patch.gz create mode 100644 readline/readline-6.3.8-wcwidth.patch diff --git a/readline/.footprint b/readline/.footprint index ff3f015..afefd06 100644 --- a/readline/.footprint +++ b/readline/.footprint @@ -22,16 +22,11 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libhistory.so -> ../../lib/libhistory.so.6.3 -rw-r--r-- root/root usr/lib/libreadline.a lrwxrwxrwx root/root usr/lib/libreadline.so -> ../../lib/libreadline.so.6.3 -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man3/ --rw-r--r-- root/root usr/man/man3/history.3.gz --rw-r--r-- root/root usr/man/man3/readline.3.gz drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/doc/ -drwxr-xr-x root/root usr/share/doc/readline/ --rw-r--r-- root/root usr/share/doc/readline/CHANGES --rw-r--r-- root/root usr/share/doc/readline/INSTALL --rw-r--r-- root/root usr/share/doc/readline/README +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man3/ +-rw-r--r-- root/root usr/share/man/man3/history.3.gz +-rw-r--r-- root/root usr/share/man/man3/readline.3.gz drwxr-xr-x root/root usr/share/readline/ -rw-r--r-- root/root usr/share/readline/excallback.c -rw-r--r-- root/root usr/share/readline/fileman.c diff --git a/readline/.md5sum b/readline/.md5sum index 0733426..ae22d1e 100644 --- a/readline/.md5sum +++ b/readline/.md5sum @@ -1,4 +1,4 @@ 553cf04fdeec54dca12062864c3ffba3 inputrc -b1efd651024094fa2f0f3a34d2d0f0b7 readline-6.3.6-wcwidth.patch -44b8c334f34790e920a807a126996882 readline-6.3.6.patch.gz +b1efd651024094fa2f0f3a34d2d0f0b7 readline-6.3.8-wcwidth.patch +bfba9ca30c7252588ea50bcc61f1006c readline-6.3.8.patch.gz 33c8fb279e981274f485fd91da77e94a readline-6.3.tar.gz diff --git a/readline/Pkgfile b/readline/Pkgfile index e5e0e00..d4c9bbc 100644 --- a/readline/Pkgfile +++ b/readline/Pkgfile @@ -5,8 +5,8 @@ # Depends on: ncurses name=readline -version=6.3.6 -release=1 +version=6.3.8 +release=2 source=(http://ftp.gnu.org/gnu/$name/$name-${version::3}.tar.gz \ $name-$version.patch.gz inputrc $name-$version-wcwidth.patch) @@ -18,15 +18,14 @@ build() { # Don't use rpath for linking the shared libs sed -i '117s/-Wl,-rpath,$(libdir)//' support/shobj-conf - # Patch to avoid wcwidth tests + # Patch to avoid wcwidth tests patch -i $SRC/$name-$version-wcwidth.patch ./configure --build=$CHOST \ --host=$CTARGET \ - --prefix=/usr \ - --mandir=/usr/man - make SHLIB_LIBS=-lncurses - make DESTDIR=$PKG install + --prefix=/usr + make -j1 SHLIB_LIBS=-lncurses + make -j1 DESTDIR=$PKG install install -d $PKG/lib mv $PKG/usr/lib/lib*.so.* $PKG/lib @@ -34,5 +33,5 @@ build() { ln -sf ../../lib/libreadline.so.${version:0:3} $PKG/usr/lib/libreadline.so install -D -m 644 $SRC/inputrc $PKG/etc/inputrc - rm -r $PKG/usr/share/info + rm -r $PKG/usr/share/{doc,info} } diff --git a/readline/readline-6.3.6.patch.gz b/readline/readline-6.3.6.patch.gz deleted file mode 100644 index bbbf63977acc94508e8c52611be7c733f9b6dfb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2572 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 diff --git a/readline/readline-6.3.8-wcwidth.patch b/readline/readline-6.3.8-wcwidth.patch new file mode 100644 index 0000000..6570b33 --- /dev/null +++ b/readline/readline-6.3.8-wcwidth.patch @@ -0,0 +1,97 @@ +diff -ur original/readline-6.3/configure build/readline-6.3/configure +--- original/readline-6.3/configure 2013-03-13 23:14:53.000000000 +0900 ++++ build/readline-6.3/configure 2014-04-28 22:52:45.510169436 +0900 +@@ -6316,49 +6316,49 @@ + + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 +-$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } +-if ${bash_cv_wcwidth_broken+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-#include +-#include +- +-#include +-#include +- +-main(c, v) +-int c; +-char **v; +-{ +- int w; +- +- setlocale(LC_ALL, "en_US.UTF-8"); +- w = wcwidth (0x0301); +- exit (w == 0); /* exit 0 if wcwidth broken */ +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- bash_cv_wcwidth_broken=yes +-else +- bash_cv_wcwdith_broken=no +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-fi ++#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 ++#$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } ++#if ${bash_cv_wcwidth_broken+:} false; then : ++# $as_echo_n "(cached) " >&6 ++#else ++# if test "$cross_compiling" = yes; then : ++# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++#as_fn_error $? "cannot run test program while cross compiling ++#See \`config.log' for more details" "$LINENO" 5; } ++#else ++# cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++#/* end confdefs.h. */ ++# ++##include ++##include ++##include ++# ++##include ++##include ++# ++#main(c, v) ++#int c; ++#char **v; ++#{ ++# int w; ++# ++# setlocale(LC_ALL, "en_US.UTF-8"); ++# w = wcwidth (0x0301); ++# exit (w == 0); /* exit 0 if wcwidth broken */ ++#} ++# ++#_ACEOF ++#if ac_fn_c_try_run "$LINENO"; then : ++# bash_cv_wcwidth_broken=yes ++#else ++# bash_cv_wcwdith_broken=no ++#fi ++#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++# conftest.$ac_objext conftest.beam conftest.$ac_ext ++#fi ++bash_cv_wcwdith_broken=no ++#fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bash_cv_wcwidth_broken" >&5 + $as_echo "$bash_cv_wcwidth_broken" >&6; } + if test "$bash_cv_wcwidth_broken" = yes; then + -- 2.26.2