archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/readline to 6.3-3

Browse source
This commit is contained in:
Kevin Mihelich 2014-03-16 13:33:53 +00:00
parent 406035f87e
commit b1050e08bf
3 changed files with 61 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
core/readline/PKGBUILD
View file

@ -1,5 +1,6 @@
# $Id$
# Maintainer: Allan McRae <allan@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
@ -10,39 +11,54 @@ pkgname=readline
_basever=6.3
_patchlevel=000 #prepare for some patches
pkgver=$_basever #.$_patchlevel
pkgrel=1.1
pkgdesc="GNU readline library"
pkgrel=3
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')
options=('!emptydirs')
install=readline.install
source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
inputrc)
if [ $_patchlevel -gt 00 ]; then
inputrc
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')
'58d54966c1191db45973cb3191ac621a'
'fcfe0a50c69f56f66ad04127a927862e'
'ee4e0df0dbf7e80783b7aa198c67fb45')
build() {
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
# Remove RPATH from shared objects (FS#14366)
# 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
# fix getting -lncurses through to SHLIB_LIBS
sed -i 's/SHLIB_LIBS = @SHLIB_LIBS@/SHLIB_LIBS = @SHLIB_LIBS@ -lncurses/' shlib/Makefile.in
}
build() {
cd $pkgname-$pkgver
# build with -fPIC for x86_64 (FS#15634)
[[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
@ -52,8 +68,6 @@ build() {
}
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
}

16
core/readline/readline-6.3-dispatch-multikey.patch Normal file
View file

@ -0,0 +1,16 @@
*** ../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 ();

15
core/readline/readline-6.3-vi-last.patch Normal file
View file

@ -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);