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

[Pierre Schmitz]

    Date: Monday, January 30, 2012 @ 09:35:01
  Author: pierre
Revision: 148042

upgpkg: zlib 1.2.6-1

upstream update

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

----------------------------+
 PKGBUILD                   |   17 +++++------------
 zlib-1.2.5-lfs-decls.patch |   13 -------------
 2 files changed, 5 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-30 14:27:55 UTC (rev 148041)
+++ PKGBUILD	2012-01-30 14:35:01 UTC (rev 148042)
@@ -2,25 +2,18 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=zlib
-pkgver=1.2.5
-pkgrel=4
+pkgver=1.2.6
+pkgrel=1
 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"
-        'zlib-1.2.5-lfs-decls.patch')
-md5sums=('c735eab2d659a96e5a594c9e8541ad63'
-         '4cb279ea3beab621f3526bf7b7ab99e5')
+source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
+md5sums=('618e944d7c7cd6521551e30b32322f4a')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver
-	# see http://bugs.archlinux.org/task/19280
-	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch
-	# work around gcc bug; see https://bugs.archlinux.org/task/20647
-	export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK"
 	./configure --prefix=/usr
 	make
 
@@ -29,7 +22,7 @@
 
 check() {
 	cd ${srcdir}/zlib-$pkgver
-	make check
+	make test
 }
 
 package() {

Deleted: zlib-1.2.5-lfs-decls.patch
===================================================================
--- zlib-1.2.5-lfs-decls.patch	2012-01-30 14:27:55 UTC (rev 148041)
+++ zlib-1.2.5-lfs-decls.patch	2012-01-30 14:35:01 UTC (rev 148042)
@@ -1,13 +0,0 @@
-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));