[arch-commits] Commit in readline/trunk (PKGBUILD readline-6.3-vi-last.patch)

[Allan McRae]

    Date: Saturday, March 8, 2014 @ 03:19:14
  Author: allan
Revision: 207155

upgpkg: readline 6.3-2

fix vi mode (FS#39212)

Added:
  readline/trunk/readline-6.3-vi-last.patch
Modified:
  readline/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   18 +++++++++++++-----
 readline-6.3-vi-last.patch |   15 +++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-07 21:55:07 UTC (rev 207154)
+++ PKGBUILD	2014-03-08 02:19:14 UTC (rev 207155)
@@ -6,7 +6,7 @@
 _basever=6.3
 _patchlevel=000 #prepare for some patches
 pkgver=$_basever #.$_patchlevel
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU readline library"
 arch=('i686' 'x86_64')
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
@@ -16,7 +16,8 @@
 options=('!emptydirs')
 install=readline.install
 source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
-        inputrc)
+        inputrc
+        readline-6.3-vi-last.patch)
 if [ $_patchlevel -gt 00 ]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
         source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
@@ -24,10 +25,10 @@
 fi
 md5sums=('33c8fb279e981274f485fd91da77e94a'
          'SKIP'
-         '58d54966c1191db45973cb3191ac621a')
+         '58d54966c1191db45973cb3191ac621a'
+         'fcfe0a50c69f56f66ad04127a927862e')
 
-
-build() {
+preapre() {
   cd ${srcdir}/${pkgname}-$_basever
   for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
     msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
@@ -34,9 +35,16 @@
     patch -p0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
   done
 
+  # patch from upstream mailing list to fix vi mode
+  patch -p2 -i $srcdir/readline-6.3-vi-last.patch
+
   # Remove RPATH from shared objects (FS#14366)
   sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
+}
 
+build() {
+  cd ${srcdir}/${pkgname}-$_basever
+
   # build with -fPIC for x86_64 (FS#15634)
   [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
 

Added: readline-6.3-vi-last.patch
===================================================================
--- readline-6.3-vi-last.patch	                        (rev 0)
+++ readline-6.3-vi-last.patch	2014-03-08 02:19:14 UTC (rev 207155)
@@ -0,0 +1,15 @@
+*** ../bash-4.3/lib/readline/readline.c	2013-10-28 14:58:06.000000000 -0400
+--- lib/readline/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);