diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-17 03:59:01 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-17 03:59:01 +0000 |
| commit | 0a765aad3e78dae0cc72b1a255b39a071f018963 (patch) | |
| tree | 4470d78dab2a0837a974753450b785b3124ecc2f /core/patch | |
| parent | 104850be98b3524ebd11d742ebc2996dd5dd50d4 (diff) | |
Thu Jul 17 03:55:04 UTC 2014
Diffstat (limited to 'core/patch')
| -rw-r--r-- | core/patch/PKGBUILD | 37 | ||||
| -rw-r--r-- | core/patch/patch-2.6.1-get-arg.patch | 12 |
2 files changed, 20 insertions, 29 deletions
diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD index 5d7b9f06a..5d352ba5a 100644 --- a/core/patch/PKGBUILD +++ b/core/patch/PKGBUILD @@ -1,43 +1,46 @@ -# $Id: PKGBUILD 174021 2013-01-01 15:15:16Z foutrelis $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 216931 2014-07-16 17:04:51Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch pkgver=2.7.1 -pkgrel=2 -pkgdesc="A utility to apply patch files to original sources" +pkgrel=3 +pkgdesc='A utility to apply patch files to original sources' arch=('i686' 'x86_64') -url="http://www.gnu.org/software/patch/patch.html" +url='http://www.gnu.org/software/patch/patch.html' license=('GPL') groups=('base-devel') -depends=('glibc') +depends=('glibc' 'attr') makedepends=('ed') optdepends=('ed: for patch -e functionality') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - patch-2.7.1-initialize-data-structures-early-enough.patch) +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} + 'patch-2.7.1-initialize-data-structures-early-enough.patch') md5sums=('e9ae5393426d3ad783a300a338c09b72' - 'b12189e0de3cb2af25268441647ec517' + 'SKIP' 'dc6367a7cd49933d4006c246789e98da') -build() { - cd ${srcdir}/${pkgname}-${pkgver} - +prepare() { # Fix segfault on non-numeric strip-count # (also segfaults on nonexistent directory passed to -d) # http://savannah.gnu.org/bugs/?37500 - patch -Np1 -i \ - $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch + patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch +} +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/core/patch/patch-2.6.1-get-arg.patch b/core/patch/patch-2.6.1-get-arg.patch deleted file mode 100644 index 45f3bc8a5..000000000 --- a/core/patch/patch-2.6.1-get-arg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c ---- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100 -+++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100 -@@ -558,7 +558,7 @@ static struct option const longopts[] = - {"remove-empty-files", no_argument, NULL, 'E'}, - {"force", no_argument, NULL, 'f'}, - {"fuzz", required_argument, NULL, 'F'}, -- {"get", no_argument, NULL, 'g'}, -+ {"get", required_argument, NULL, 'g'}, - {"input", required_argument, NULL, 'i'}, - {"ignore-whitespace", no_argument, NULL, 'l'}, - #ifdef ENABLE_MERGE |