Wed Apr 9 03:34:06 UTC 2014

3 files changed, 23 insertions, 58 deletions

diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD
index 3057ba59b..4e23bbbe4 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 207976 2014-03-16 10:09:09Z bpiotrowski $
+# $Id: PKGBUILD 209916 2014-04-08 15:23:41Z anatolik $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=readline
 _basever=6.3
-_patchlevel=000 #prepare for some patches
-pkgver=$_basever #.$_patchlevel
-pkgrel=3
+_patchlevel=003
+pkgver=$_basever.$_patchlevel
+pkgrel=2
 pkgdesc='GNU readline library'
 arch=('i686' 'x86_64')
 url='http://tiswww.case.edu/php/chet/readline/rltop.html'
@@ -17,41 +17,27 @@ backup=('etc/inputrc')
 options=('!emptydirs')
 install=readline.install
 source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
-        inputrc
-        readline-6.3-vi-last.patch
-        readline-6.3-dispatch-multikey.patch)
+        inputrc)
 
 if [[ $_patchlevel -gt 0 ]]; 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})
+    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})
     done
 fi
 
-md5sums=('33c8fb279e981274f485fd91da77e94a'
-         'SKIP'
-         '58d54966c1191db45973cb3191ac621a'
-         'fcfe0a50c69f56f66ad04127a927862e'
-         'ee4e0df0dbf7e80783b7aa198c67fb45')
-
 prepare() {
-  cd $pkgname-$pkgver
-  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-    msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
-    patch -p0 -i ../readline${_basever//./}-$(printf "%03d" $p)
+  cd $pkgname-$_basever
+  for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do
+    msg "applying patch readline${_basever//.}-$(printf "%03d" $_p)"
+    patch -p0 -i ../readline${_basever//.}-$(printf "%03d" $_p)
   done
 
-  # patch from upstream mailing list to fix vi mode
-  patch -p2 -i ../readline-6.3-vi-last.patch
-
-  # patch from upstream mailing list to fix the crash after pressing Delete twice
-  patch -p2 -i ../readline-6.3-dispatch-multikey.patch
-
   # remove RPATH from shared objects (FS#14366)
   sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$_basever
 
   # build with -fPIC for x86_64 (FS#15634)
   [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
@@ -61,6 +47,16 @@ build() {
 }
 
 package() {
-  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+  make -C $pkgname-$_basever DESTDIR="$pkgdir" install
   install -Dm644 inputrc "$pkgdir"/etc/inputrc
 }
+
+md5sums=('33c8fb279e981274f485fd91da77e94a'
+         'SKIP'
+         '58d54966c1191db45973cb3191ac621a'
+         '4343f5ea9b0f42447f102fb61576b398'
+         'SKIP'
+         '700295212f7e2978577feaee584afddb'
+         'SKIP'
+         'af4963862f5156fbf9111c2c6fa86ed7'
+         'SKIP')
diff --git a/core/readline/readline-6.3-dispatch-multikey.patch b/core/readline/readline-6.3-dispatch-multikey.patch
deleted file mode 100644
index 2624083a7..000000000
--- a/core/readline/readline-6.3-dispatch-multikey.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-*** ../bash-4.3/lib/readline/readline.c	2013-10-28 14:58:06.000000000 -0400
---- lib/readline/readline.c	2014-03-10 14:15:02.000000000 -0400
-***************
-*** 745,749 ****
-  
-    RL_CHECK_SIGNALS ();
-!   if (r == 0)			/* success! */
-      {
-        _rl_keyseq_chain_dispose ();
---- 745,750 ----
-  
-    RL_CHECK_SIGNALS ();
-!   /* We only treat values < 0 specially to simulate recursion. */
-!   if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */
-      {
-        _rl_keyseq_chain_dispose ();
diff --git a/core/readline/readline-6.3-vi-last.patch b/core/readline/readline-6.3-vi-last.patch
deleted file mode 100644
index 59153a4db..000000000
--- a/core/readline/readline-6.3-vi-last.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-*** ../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);