readline: added missing patch

diff --git a/readline/Pkgfile b/readline/Pkgfile
index d4c9bbcd3d95e504b93a68921bdf708be6a3a5ef..3202c583897aabf6ec4c3c400916b2d5aeb349eb 100644 (file)
--- a/readline/Pkgfile
+++ b/readline/Pkgfile
@@ -18,7 +18,7 @@ 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 \

diff --git a/readline/readline-6.3.6-wcwidth.patch b/readline/readline-6.3.6-wcwidth.patch
deleted file mode 100644 (file)
index 6570b33..0000000
--- a/readline/readline-6.3.6-wcwidth.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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 <unistd.h>
--#include <stdlib.h>
--#include <stdio.h>
--
--#include <locale.h>
--#include <wchar.h>
--
--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 <unistd.h>
-+##include <stdlib.h>
-+##include <stdio.h>
-+#
-+##include <locale.h>
-+##include <wchar.h>
-+#
-+#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
-

diff --git a/readline/readline-6.3.8.patch.gz b/readline/readline-6.3.8.patch.gz
new file mode 100644 (file)
index 0000000..1c3cd7a
Binary files /dev/null and b/readline/readline-6.3.8.patch.gz differ