main/readline: add fix for various issues in dependent applications

This commit is contained in:
Bartłomiej Piotrowski 2014-03-11 17:01:44 +01:00
parent 148b7a69ea
commit efa74eb42f
2 changed files with 24 additions and 4 deletions

View File

@ -5,7 +5,7 @@ pkgver=6.3
#_patchver=${pkgver##*.}
#_suff=${_myver%.*}${_myver#*.}
_myver=$pkgver
pkgrel=1
pkgrel=2
pkgdesc="GNU readline library"
url="ftp://ftp.cwru.edu/pub/bash/"
arch="all"
@ -15,6 +15,7 @@ makedepends="ncurses-dev"
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
"
# generate url's to patches. note: no forks allowed!
@ -65,8 +66,11 @@ package() {
}
md5sums="33c8fb279e981274f485fd91da77e94a readline-6.3.tar.gz
cbb34dd4ade349d47ec434bb01222aeb fix-ncurses-underlinking.patch"
cbb34dd4ade349d47ec434bb01222aeb fix-ncurses-underlinking.patch
2670222b867547435b1acf0671e9f42f readline-6.3-dispatch-multikey.patch"
sha256sums="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 readline-6.3.tar.gz
755dd2a6231a7e49dfde429188b3120f08cb652fbbf1863bb3db8f8181e9dd10 fix-ncurses-underlinking.patch"
755dd2a6231a7e49dfde429188b3120f08cb652fbbf1863bb3db8f8181e9dd10 fix-ncurses-underlinking.patch
5be0bcc9aebcea5f9a6e9929d33d27a68629bbc209465d1e81d294f9c0005e09 readline-6.3-dispatch-multikey.patch"
sha512sums="f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 readline-6.3.tar.gz
2aef2e3ceb8fb08117a945fbdbb883ff8da7eaf259236cb64aebc7438dd17c73e52d0c7a5f1483432152fa8354f84468aacaede09ca0fa9e76ce6a1d82eb6f26 fix-ncurses-underlinking.patch"
2aef2e3ceb8fb08117a945fbdbb883ff8da7eaf259236cb64aebc7438dd17c73e52d0c7a5f1483432152fa8354f84468aacaede09ca0fa9e76ce6a1d82eb6f26 fix-ncurses-underlinking.patch
e03c2cce89a30564fd23aea882925b24e1f8ccbc40ebfdebad3bba63d8bf259778861e615e24088e7a05a9c2da05bba4d42fdfdf23c0f971d398a7f4b5124abb readline-6.3-dispatch-multikey.patch"

View File

@ -0,0 +1,16 @@
*** readline/readline.c 2013-10-28 14:58:06.000000000 -0400
--- 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 ();