[arch-commits] Commit in zlib/repos (4 files)

Pierre Schmitz pierre at archlinux.org
Tue Jan 31 23:47:55 UTC 2012


    Date: Tuesday, January 31, 2012 @ 18:47:55
  Author: pierre
Revision: 148444

db-move: moved zlib from [testing] to [core] (x86_64)

Added:
  zlib/repos/core-x86_64/PKGBUILD
    (from rev 148442, zlib/repos/testing-x86_64/PKGBUILD)
Deleted:
  zlib/repos/core-x86_64/PKGBUILD
  zlib/repos/core-x86_64/zlib-1.2.5-lfs-decls.patch
  zlib/repos/testing-x86_64/

----------------------------+
 PKGBUILD                   |   71 +++++++++++++++++++------------------------
 zlib-1.2.5-lfs-decls.patch |   13 -------
 2 files changed, 32 insertions(+), 52 deletions(-)

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-01-31 23:47:54 UTC (rev 148443)
+++ core-x86_64/PKGBUILD	2012-01-31 23:47:55 UTC (rev 148444)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=zlib
-pkgver=1.2.5
-pkgrel=4
-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')
-
-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
-
-	grep -A 24 '^  Copyright' zlib.h > LICENSE
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make check
-}
-
-package() {
-	cd ${srcdir}/zlib-$pkgver
-	make install DESTDIR=${pkgdir}
-	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
-}

Copied: zlib/repos/core-x86_64/PKGBUILD (from rev 148442, zlib/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-01-31 23:47:55 UTC (rev 148444)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=zlib
+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')
+source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
+md5sums=('618e944d7c7cd6521551e30b32322f4a')
+
+build() {
+	cd ${srcdir}/zlib-$pkgver
+	./configure --prefix=/usr
+	make
+
+	grep -A 24 '^  Copyright' zlib.h > LICENSE
+}
+
+check() {
+	cd ${srcdir}/zlib-$pkgver
+	make test
+}
+
+package() {
+	cd ${srcdir}/zlib-$pkgver
+	make install DESTDIR=${pkgdir}
+	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
+}

Deleted: core-x86_64/zlib-1.2.5-lfs-decls.patch
===================================================================
--- core-x86_64/zlib-1.2.5-lfs-decls.patch	2012-01-31 23:47:54 UTC (rev 148443)
+++ core-x86_64/zlib-1.2.5-lfs-decls.patch	2012-01-31 23:47:55 UTC (rev 148444)
@@ -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));




More information about the arch-commits mailing list