diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
| commit | 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch) | |
| tree | 175c9e1755980b2a955b1b9e6b93c1a3d431276f /extra/libzip | |
| parent | 933e5d274b2a4e386565d2f3bb982682e168438b (diff) | |
| parent | 2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/alienarena/PKGBUILD
community/mumble/PKGBUILD
community/mysql-workbench/PKGBUILD
community/paintown/PKGBUILD
community/ufoai/PKGBUILD
core/dcron/PKGBUILD
core/udev/PKGBUILD
extra/qt/PKGBUILD
extra/texlive-bin/PKGBUILD
testing/opencv/PKGBUILD
testing/pciutils/PKGBUILD
testing/usbutils/PKGBUILD
Diffstat (limited to 'extra/libzip')
| -rw-r--r-- | extra/libzip/PKGBUILD | 20 | ||||
| -rw-r--r-- | extra/libzip/fix-headers.patch | 15 |
2 files changed, 27 insertions, 8 deletions
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD index 916dfd2da..5c485cce0 100644 --- a/extra/libzip/PKGBUILD +++ b/extra/libzip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77453 2010-04-13 12:26:29Z andrea $ +# $Id: PKGBUILD 122444 2011-05-04 07:26:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libzip -pkgver=0.9.3 +pkgver=0.10 pkgrel=1 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" @@ -11,16 +11,20 @@ license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('zlib') options=('!libtool') -source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('e5fa5d0c5d2ad4c7a0c0fc7f5a1695b9') +source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'fix-headers.patch') +md5sums=('47cdfcbc08c8bea0b52fdee4bf591622' + '249395bd3a426c4c4e993e9d4753e1dd') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i "${srcdir}/fix-headers.patch" ./configure --prefix=/usr - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install } diff --git a/extra/libzip/fix-headers.patch b/extra/libzip/fix-headers.patch new file mode 100644 index 000000000..759171070 --- /dev/null +++ b/extra/libzip/fix-headers.patch @@ -0,0 +1,15 @@ +diff -urN libzip-0.10rc1.old/lib/Makefile.am libzip-0.10rc1/lib/Makefile.am +--- libzip-0.10rc1.old/lib/Makefile.am 2011-03-05 01:07:33.921722002 +0100 ++++ libzip-0.10rc1/lib/Makefile.am 2011-03-05 20:29:30.349388003 +0100 +@@ -2,8 +2,9 @@ + + lib_LTLIBRARIES = libzip.la + noinst_HEADERS = zipint.h +-include_HEADERS = zip.h +-libinclude_HEADERS = zipconf.h ++include_HEADERS = \ ++ zip.h \ ++ zipconf.h + + # also update CMakeLists.txt when changing version + libzip_la_LDFLAGS=-no-undefined -version-info 2:0 |