[arch-commits] Commit in readline/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Monday, March 10, 2014 @ 22:12:11
  Author: bpiotrowski
Revision: 207483

upgpkg: readline 6.3-2

add another patch partially fixing issues in ipython (FS#39144)

Added:
  readline/trunk/readline-6.3-dispatch-multikey.patch
Modified:
  readline/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   38 +++++++++++++++++++--------------
 readline-6.3-dispatch-multikey.patch |   15 +++++++++++++
 2 files changed, 37 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-10 20:51:07 UTC (rev 207482)
+++ PKGBUILD	2014-03-10 21:12:11 UTC (rev 207483)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=readline
@@ -7,9 +8,9 @@
 _patchlevel=000 #prepare for some patches
 pkgver=$_basever #.$_patchlevel
 pkgrel=2
-pkgdesc="GNU readline library"
+pkgdesc='GNU readline library'
 arch=('i686' 'x86_64')
-url="http://tiswww.case.edu/php/chet/readline/rltop.html"
+url='http://tiswww.case.edu/php/chet/readline/rltop.html'
 license=('GPL')
 depends=('glibc' 'ncurses')
 backup=('etc/inputrc')
@@ -17,33 +18,40 @@
 install=readline.install
 source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
         inputrc
-        readline-6.3-vi-last.patch)
-if [ $_patchlevel -gt 00 ]; then
+        readline-6.3-vi-last.patch
+        readline-6.3-dispatch-multikey.patch)
+
+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})
     done
 fi
+
 md5sums=('33c8fb279e981274f485fd91da77e94a'
          'SKIP'
          '58d54966c1191db45973cb3191ac621a'
-         'fcfe0a50c69f56f66ad04127a927862e')
+         'fcfe0a50c69f56f66ad04127a927862e'
+         '5daf0ad2a175ccd43d7791ee3ce3d520')
 
-preapre() {
-  cd ${srcdir}/${pkgname}-$_basever
+prepare() {
+  cd $pkgname-$pkgver
   for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
     msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
-    patch -p0 -i $srcdir/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 $srcdir/readline-6.3-vi-last.patch
+  patch -p2 -i ../readline-6.3-vi-last.patch
 
-  # Remove RPATH from shared objects (FS#14366)
+  # 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 ${srcdir}/${pkgname}-$_basever
+  cd $pkgname-$pkgver
 
   # build with -fPIC for x86_64 (FS#15634)
   [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
@@ -53,8 +61,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+  install -Dm644 inputrc "$pkgdir"/etc/inputrc
 }

Added: readline-6.3-dispatch-multikey.patch
===================================================================
--- readline-6.3-dispatch-multikey.patch	                        (rev 0)
+++ readline-6.3-dispatch-multikey.patch	2014-03-10 21:12:11 UTC (rev 207483)
@@ -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-10 11:01:19.000000000 -0400
+***************
+*** 745,749 ****
+  
+    RL_CHECK_SIGNALS ();
+!   if (r == 0)			/* success! */
+      {
+        _rl_keyseq_chain_dispose ();
+--- 745,749 ----
+  
+    RL_CHECK_SIGNALS ();
+!   if (r == 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */
+      {
+        _rl_keyseq_chain_dispose ();