From 4acd2c992bb19b9125ddce9b268e207eee378af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski@alpinelinux.org>
Date: Thu, 20 Mar 2014 15:24:22 +0100
Subject: main/readline: backport various fixes for dependent packages

---
 main/readline/APKBUILD                             | 12 ++++++++----
 main/readline/readline-6.3-dispatch-multikey.patch |  4 ++--
 main/readline/readline-6.3-vi-last.patch           | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 main/readline/readline-6.3-vi-last.patch

(limited to 'main')

diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD
index fa518fab0..9246844c3 100644
--- a/main/readline/APKBUILD
+++ b/main/readline/APKBUILD
@@ -5,7 +5,7 @@ pkgver=6.3
 #_patchver=${pkgver##*.}
 #_suff=${_myver%.*}${_myver#*.}
 _myver=$pkgver
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU readline library"
 url="ftp://ftp.cwru.edu/pub/bash/"
 arch="all"
@@ -16,6 +16,7 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.gnu.org/gnu/readline/readline-${_myver}.tar.gz
 	fix-ncurses-underlinking.patch
 	readline-6.3-dispatch-multikey.patch
+	readline-6.3-vi-last.patch
 	"
 
 # generate url's to patches. note: no forks allowed!
@@ -67,10 +68,13 @@ package() {
 
 md5sums="33c8fb279e981274f485fd91da77e94a  readline-6.3.tar.gz
 cbb34dd4ade349d47ec434bb01222aeb  fix-ncurses-underlinking.patch
-2670222b867547435b1acf0671e9f42f  readline-6.3-dispatch-multikey.patch"
+83f7c9ae2c02579934b10cb3fe9dea0b  readline-6.3-dispatch-multikey.patch
+a825e0357b4c685f92bee7bfacf2a845  readline-6.3-vi-last.patch"
 sha256sums="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43  readline-6.3.tar.gz
 755dd2a6231a7e49dfde429188b3120f08cb652fbbf1863bb3db8f8181e9dd10  fix-ncurses-underlinking.patch
-5be0bcc9aebcea5f9a6e9929d33d27a68629bbc209465d1e81d294f9c0005e09  readline-6.3-dispatch-multikey.patch"
+42488da748b4f57dccccd224d02dac677ae7b7af39f104194c2aa63272a67467  readline-6.3-dispatch-multikey.patch
+411380911760e441688d65efd0f12b0bfda09e9d4ea677296bfde22744a6d6fe  readline-6.3-vi-last.patch"
 sha512sums="f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401  readline-6.3.tar.gz
 2aef2e3ceb8fb08117a945fbdbb883ff8da7eaf259236cb64aebc7438dd17c73e52d0c7a5f1483432152fa8354f84468aacaede09ca0fa9e76ce6a1d82eb6f26  fix-ncurses-underlinking.patch
-e03c2cce89a30564fd23aea882925b24e1f8ccbc40ebfdebad3bba63d8bf259778861e615e24088e7a05a9c2da05bba4d42fdfdf23c0f971d398a7f4b5124abb  readline-6.3-dispatch-multikey.patch"
+d9c37f3c3b003bd7084ecee8c4b6473691135cbd0663eabbc0fbd6b703e06cd8b8a5f947c5a443efbcb9593745a0c131c573b02187f4f02fd8596b0511af948e  readline-6.3-dispatch-multikey.patch
+a71af4314a772a68072720cac95a89d95584dc78adac6af233bb2abcff3c2978c4d2fcd17e225a46976e2b3f0b5f27e13f531669d152d037453e0a959bbe6e22  readline-6.3-vi-last.patch"
diff --git a/main/readline/readline-6.3-dispatch-multikey.patch b/main/readline/readline-6.3-dispatch-multikey.patch
index 5996bb8a6..641a2f3d6 100644
--- a/main/readline/readline-6.3-dispatch-multikey.patch
+++ b/main/readline/readline-6.3-dispatch-multikey.patch
@@ -1,5 +1,5 @@
-*** readline/readline.c	2013-10-28 14:58:06.000000000 -0400
---- readline/readline.c	2014-03-10 14:15:02.000000000 -0400
+*** a/readline.c	2013-10-28 14:58:06.000000000 -0400
+--- b/readline.c	2014-03-10 14:15:02.000000000 -0400
 ***************
 *** 745,749 ****
   
diff --git a/main/readline/readline-6.3-vi-last.patch b/main/readline/readline-6.3-vi-last.patch
new file mode 100644
index 000000000..9c4fc573d
--- /dev/null
+++ b/main/readline/readline-6.3-vi-last.patch
@@ -0,0 +1,15 @@
+*** a/readline.c	2013-10-28 14:58:06.000000000 -0400
+--- b/readline.c	2014-03-07 15:20:33.000000000 -0500
+***************
+*** 965,969 ****
+    if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+        key != ANYOTHERKEY &&
+!       rl_key_sequence_length == 1 &&	/* XXX */
+        _rl_vi_textmod_command (key))
+      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+--- 965,969 ----
+    if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+        key != ANYOTHERKEY &&
+!       _rl_dispatching_keymap == vi_movement_keymap &&
+        _rl_vi_textmod_command (key))
+      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
-- 
cgit v1.2.3