diff options
Diffstat (limited to 'core/readline/PKGBUILD')
| -rw-r--r-- | core/readline/PKGBUILD | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index 052244dac..3057ba59b 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,41 +1,57 @@ -# $Id: PKGBUILD 206524 2014-03-01 06:07:23Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 207976 2014-03-16 10:09:09Z bpiotrowski $ +# 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=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 +} + +build() { + cd $pkgname-$pkgver # build with -fPIC for x86_64 (FS#15634) [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC" @@ -45,8 +61,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 } |