diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-07 17:53:02 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-07 17:53:02 (GMT) |
| commit | 3fb087ae5878de43a2987c96446868fe31d0c806 (patch) | |
| tree | ffb6f66a2c44d1f35a531e5fd327b5526d1309a8 /abs/core | |
| parent | ef649d30d963fcc66ce63df39b2ff2ad711bba9d (diff) | |
| download | linhes_pkgbuild-3fb087ae5878de43a2987c96446868fe31d0c806.zip linhes_pkgbuild-3fb087ae5878de43a2987c96446868fe31d0c806.tar.gz linhes_pkgbuild-3fb087ae5878de43a2987c96446868fe31d0c806.tar.bz2 | |
patch 2.6.1
Diffstat (limited to 'abs/core')
| -rw-r--r-- | abs/core/patch/PKGBUILD | 26 | ||||
| -rw-r--r-- | abs/core/patch/patch-2.6.1-get-arg.patch | 12 |
2 files changed, 32 insertions, 6 deletions
diff --git a/abs/core/patch/PKGBUILD b/abs/core/patch/PKGBUILD index 3124e1f..8c0185f 100644 --- a/abs/core/patch/PKGBUILD +++ b/abs/core/patch/PKGBUILD @@ -1,26 +1,40 @@ -# $Id: PKGBUILD 62841 2010-01-13 01:57:24Z allan $ +# $Id: PKGBUILD 142074 2011-11-04 23:36:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch pkgver=2.6.1 -pkgrel=1 +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" license=('GPL') groups=('base-devel') depends=('glibc') +makedepends=('ed') optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d758eb96d3f75047efc004a720d33daf') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + patch-2.6.1-get-arg.patch) +md5sums=('d758eb96d3f75047efc004a720d33daf' + 'f7953f3e472fae5118815e6138372e22' + '45cd5709adbbcdcb3ab95dc43559c07c') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # Fixed argument type for --get + # see https://bugzilla.redhat.com/show_bug.cgi?id=553624 + patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 + make } + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install || return 1 + make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install } diff --git a/abs/core/patch/patch-2.6.1-get-arg.patch b/abs/core/patch/patch-2.6.1-get-arg.patch new file mode 100644 index 0000000..45f3bc8 --- /dev/null +++ b/abs/core/patch/patch-2.6.1-get-arg.patch @@ -0,0 +1,12 @@ +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 |