readline: bump to version 6.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/readline/readline-001-curses-link.patch b/package/readline/readline-001-curses-link.patch
new file mode 100644 (file)
index 0000000..56b4770
--- /dev/null
+++ b/package/readline/readline-001-curses-link.patch
@@ -0,0 +1,16 @@
+link readline directly to ncurses since it needs symbols from it
+
+upstream readline does this on purpose (no direct linking), but
+it doesn't make much sense in a Linux world
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -42,7 +42,7 @@
+ SHOBJ_LIBS=
+ 
+ SHLIB_XLDFLAGS=
+-SHLIB_LIBS=
++SHLIB_LIBS=-lncurses
+ 
+ SHLIB_DOT='.'
+ SHLIB_LIBPREF='lib'

diff --git a/package/readline/readline-6.2-curses-link.patch b/package/readline/readline-6.2-curses-link.patch
deleted file mode 100644 (file)
index 56b4770..0000000
--- a/package/readline/readline-6.2-curses-link.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-link readline directly to ncurses since it needs symbols from it
-
-upstream readline does this on purpose (no direct linking), but
-it doesn't make much sense in a Linux world
-
---- a/support/shobj-conf
-+++ b/support/shobj-conf
-@@ -42,7 +42,7 @@
- SHOBJ_LIBS=
- 
- SHLIB_XLDFLAGS=
--SHLIB_LIBS=
-+SHLIB_LIBS=-lncurses
- 
- SHLIB_DOT='.'
- SHLIB_LIBPREF='lib'

diff --git a/package/readline/readline-6.2-pl1.patch b/package/readline/readline-6.2-pl1.patch
deleted file mode 100644 (file)
index 9ef0e48..0000000
--- a/package/readline/readline-6.2-pl1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Bug-Reported-by:       Clark J. Wang <dearvoid@gmail.com>
-Bug-Reference-ID:      <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
-Bug-Reference-URL:     http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
-
-diff -Nura readline-6.2/callback.c readline-6.2-pl1/callback.c
---- readline-6.2/callback.c    2010-06-06 13:18:58.000000000 -0300
-+++ readline-6.2-pl1/callback.c        2011-04-19 14:20:00.269829168 -0300
-@@ -148,6 +148,9 @@
-         eof = _rl_vi_domove_callback (_rl_vimvcxt);
-         /* Should handle everything, including cleanup, numeric arguments,
-            and turning off RL_STATE_VIMOTION */
-+        if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
-+         _rl_internal_char_cleanup ();
-+
-         return;
-       }
- #endif
-diff -Nura readline-6.2/vi_mode.c readline-6.2-pl1/vi_mode.c
---- readline-6.2/vi_mode.c     2010-11-20 21:51:39.000000000 -0300
-+++ readline-6.2-pl1/vi_mode.c 2011-04-19 14:19:24.510586785 -0300
-@@ -1114,7 +1114,7 @@
-       rl_beg_of_line (1, c);
-       _rl_vi_last_motion = c;
-       RL_UNSETSTATE (RL_STATE_VIMOTION);
--      return (0);
-+      return (vidomove_dispatch (m));
-     }
- #if defined (READLINE_CALLBACKS)
-   /* XXX - these need to handle rl_universal_argument bindings */

diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index c9df708483cd7dc93ebcead75e6b373a3eb68c0a..d670a71f34ed4340231da8cfb959341b7d9ac5bd 100644 (file)
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-READLINE_VERSION = 6.2
+READLINE_VERSION = 6.3
 READLINE_SITE = $(BR2_GNU_MIRROR)/readline
 READLINE_INSTALL_STAGING = YES
 READLINE_DEPENDENCIES = ncurses
-READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes
+READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \
+       bash_cv_wcwidth_broken=no
 READLINE_LICENSE = GPLv3+
 READLINE_LICENSE_FILES = COPYING