diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2011-04-26 11:56:49 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-04-26 20:45:38 +0200 |
| commit | 20c32937a7524f025d885e75c561daedbef7a01b (patch) | |
| tree | 259905d113b80d6b0ad8901a1fda5fed322141f7 | |
| parent | efae605c88deb15d9c50fd67bdd80f46a78b06c1 (diff) | |
readline: bump to version 6.2pl1
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/readline/readline-6.2-curses-link.patch (renamed from package/readline/readline-6.1-curses-link.patch) | 0 | ||||
| -rw-r--r-- | package/readline/readline-6.2-pl1.patch | 29 | ||||
| -rw-r--r-- | package/readline/readline.mk | 3 |
3 files changed, 31 insertions, 1 deletions
diff --git a/package/readline/readline-6.1-curses-link.patch b/package/readline/readline-6.2-curses-link.patch index 56b477022..56b477022 100644 --- a/package/readline/readline-6.1-curses-link.patch +++ b/package/readline/readline-6.2-curses-link.patch diff --git a/package/readline/readline-6.2-pl1.patch b/package/readline/readline-6.2-pl1.patch new file mode 100644 index 000000000..9ef0e4820 --- /dev/null +++ b/package/readline/readline-6.2-pl1.patch @@ -0,0 +1,29 @@ +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 9e25e04a1..e34c6506d 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -3,7 +3,8 @@ # build GNU readline # ############################################################# -READLINE_VERSION = 6.1 + +READLINE_VERSION = 6.2 READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES |