summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/readline
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-11-07 13:52:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-08 11:14:31 (GMT)
commit695d25452d6ad2d743b9b9fb3d418e1a0f166188 (patch)
tree744fc557713d97a9c90362078fc1cb94e4098e17 /meta/recipes-core/readline
parent7bd03ac24114b2c6015144a37e0c3fb4037baea6 (diff)
downloadpoky-695d25452d6ad2d743b9b9fb3d418e1a0f166188.tar.gz
readline: Patch for readline multikey dispatch issue
(From OE-Core rev: d301ef7c2a5e857bd87be2a24251243ff181fa24) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/readline')
-rw-r--r--meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch32
-rw-r--r--meta/recipes-core/readline/readline_6.3.bb3
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch b/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
new file mode 100644
index 0000000..54d1ac6
--- /dev/null
+++ b/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
@@ -0,0 +1,32 @@
1From 8ef852a5be72c75e17f2510bea52455f809b56ce Mon Sep 17 00:00:00 2001
2From: Chet Ramey <chet.ramey@case.edu>
3Date: Fri, 28 Mar 2014 14:07:42 -0400
4Subject: [PATCH 04/10] Readline-6.3 patch 2
5
6Fixes multi-key issue identified in this thread:
7http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
8
9Upstream-Status: Backport
10
11Signed-off-by: Saul Wold <sgw@linux.intel.com>
12---
13 readline.c | 3 ++-
14 1 files changed, 2 insertions(+), 1 deletions(-)
15
16diff --git a/readline.c b/readline.c
17index eb4eae3..abb29a0 100644
18--- a/readline.c
19+++ b/readline.c
20@@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt)
21 r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
22
23 RL_CHECK_SIGNALS ();
24- if (r == 0) /* success! */
25+ /* We only treat values < 0 specially to simulate recursion. */
26+ if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */
27 {
28 _rl_keyseq_chain_dispose ();
29 RL_UNSETSTATE (RL_STATE_MULTIKEY);
30--
311.8.3.1
32
diff --git a/meta/recipes-core/readline/readline_6.3.bb b/meta/recipes-core/readline/readline_6.3.bb
index f02f197..55964a6 100644
--- a/meta/recipes-core/readline/readline_6.3.bb
+++ b/meta/recipes-core/readline/readline_6.3.bb
@@ -1,6 +1,7 @@
1require readline.inc 1require readline.inc
2 2
3SRC_URI += "file://readline63-003" 3SRC_URI += "file://readline63-003 \
4 file://readline-dispatch-multikey.patch"
4 5
5SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a" 6SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a"
6SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 7SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43"