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

[Bartłomiej Piotrowski]

Date: Tuesday, March 11, 2014 @ 07:23:39
  Author: bpiotrowski
Revision: 207492

upgpkg: readline 6.3-3

update patch fixing various issues in ipython

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

--+
 PKGBUILD |4 ++--
 readline-6.3-dispatch-multikey.patch |7 ---
 2 files changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-11 04:40:40 UTC (rev 207491)
+++ PKGBUILD2014-03-11 06:23:39 UTC (rev 207492)
@@ -7,7 +7,7 @@
 _basever=6.3
 _patchlevel=000 #prepare for some patches
 pkgver=$_basever #.$_patchlevel
-pkgrel=2
+pkgrel=3
 pkgdesc='GNU readline library'
 arch=('i686' 'x86_64')
 url='http://tiswww.case.edu/php/chet/readline/rltop.html'
@@ -31,7 +31,7 @@
  'SKIP'
  '58d54966c1191db45973cb3191ac621a'
  'fcfe0a50c69f56f66ad04127a927862e'
- '5daf0ad2a175ccd43d7791ee3ce3d520')
+ 'ee4e0df0dbf7e80783b7aa198c67fb45')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: readline-6.3-dispatch-multikey.patch
===
--- readline-6.3-dispatch-multikey.patch2014-03-11 04:40:40 UTC (rev 
207491)
+++ readline-6.3-dispatch-multikey.patch2014-03-11 06:23:39 UTC (rev 
207492)
@@ -1,5 +1,5 @@
 *** ../bash-4.3/lib/readline/readline.c2013-10-28 14:58:06.0 
-0400
 lib/readline/readline.c2014-03-10 11:01:19.0 -0400
+--- lib/readline/readline.c2014-03-10 14:15:02.0 -0400
 ***
 *** 745,749 
   
@@ -7,9 +7,10 @@
 !   if (r == 0)/* success! */
   {
 _rl_keyseq_chain_dispose ();
 745,749 
+--- 745,750 
   
 RL_CHECK_SIGNALS ();
-!   if (r == 0 || (r == -1  (cxt-flags  KSEQ_SUBSEQ) == 0))/* 
success! or failure! */
+!   /* 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 ();

[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
===
--- PKGBUILD2014-03-10 20:51:07 UTC (rev 207482)
+++ PKGBUILD2014-03-10 21:12:11 UTC (rev 207483)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Allan McRae al...@archlinux.org
+# Maintainer:  Bartłomiej Piotrowski bpiotrow...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
 # Contributor: judd jvi...@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.patch2014-03-10 21:12:11 UTC (rev 
207483)
@@ -0,0 +1,15 @@
+*** ../bash-4.3/lib/readline/readline.c2013-10-28 14:58:06.0 
-0400
+--- lib/readline/readline.c2014-03-10 11:01:19.0 -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 ();