[arch-commits] Commit in zlib/trunk (PKGBUILD zlib-1.2.5-lfs-decls.patch)

[Pierre Schmitz]

    Date: Thursday, May 20, 2010 @ 16:58:22
  Author: pierre
Revision: 80715

Fix for FS#19280

Added:
  zlib/trunk/zlib-1.2.5-lfs-decls.patch
Modified:
  zlib/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   10 +++++++---
 zlib-1.2.5-lfs-decls.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-20 20:57:23 UTC (rev 80714)
+++ PKGBUILD	2010-05-20 20:58:22 UTC (rev 80715)
@@ -3,18 +3,22 @@
 
 pkgname=zlib
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.zlib.net/"
 depends=('glibc')
 options=('!makeflags')
-source=("http://zlib.net/zlib-${pkgver}.tar.gz")
-md5sums=('c735eab2d659a96e5a594c9e8541ad63')
+source=("http://zlib.net/zlib-${pkgver}.tar.gz"
+        'zlib-1.2.5-lfs-decls.patch')
+md5sums=('c735eab2d659a96e5a594c9e8541ad63'
+         '4cb279ea3beab621f3526bf7b7ab99e5')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver
+	# see http://bugs.archlinux.org/task/19280
+	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch || return 1
 	export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK"
 	./configure --prefix=/usr
 	make || return 1

Added: zlib-1.2.5-lfs-decls.patch
===================================================================
--- zlib-1.2.5-lfs-decls.patch	                        (rev 0)
+++ zlib-1.2.5-lfs-decls.patch	2010-05-20 20:58:22 UTC (rev 80715)
@@ -0,0 +1,13 @@
+Index: zlib-1.2.5/zlib.h
+===================================================================
+--- zlib-1.2.5.orig/zlib.h
++++ zlib-1.2.5/zlib.h
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _LARGEFILE64_SOURCE
++#  ifndef _LARGEFILE64_SOURCE
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));