aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-01-30 18:53:15 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-01-30 18:55:11 +0000
commit2cffc064b00931917f12397dfb1fd12c2d220d84 (patch)
treeefdf5c7601082de46d8f56f236dbcb7f57bd57d2
parent12cf2a8c2bc35f9541aec5123459b45cf1215156 (diff)
downloadaports-2cffc064b00931917f12397dfb1fd12c2d220d84.tar.bz2
aports-2cffc064b00931917f12397dfb1fd12c2d220d84.tar.xz
main/zlib: upgrade to 1.2.6
-rw-r--r--main/zlib/APKBUILD9
-rw-r--r--main/zlib/zlib-1.2.5-lfs-decls.patch13
2 files changed, 3 insertions, 19 deletions
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index a57073b5a2..8c2716113a 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,21 +1,19 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zlib
-pkgver=1.2.5
-pkgrel=2
+pkgver=1.2.6
+pkgrel=0
pkgdesc="A compression/decompression Library"
arch="all"
license=custom:zlib
url="http://zlib.net"
depends=
source="http://zlib.net/$pkgname-$pkgver.tar.gz
- zlib-1.2.5-lfs-decls.patch
"
subpackages="$pkgname-dev $pkgname-doc"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
- patch -p1 -i "$srcdir"/zlib-1.2.5-lfs-decls.patch
}
build() {
@@ -39,5 +37,4 @@ dev() {
mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a
}
-md5sums="c735eab2d659a96e5a594c9e8541ad63 zlib-1.2.5.tar.gz
-4cb279ea3beab621f3526bf7b7ab99e5 zlib-1.2.5-lfs-decls.patch"
+md5sums="618e944d7c7cd6521551e30b32322f4a zlib-1.2.6.tar.gz"
diff --git a/main/zlib/zlib-1.2.5-lfs-decls.patch b/main/zlib/zlib-1.2.5-lfs-decls.patch
deleted file mode 100644
index 36e26af035..0000000000
--- a/main/zlib/zlib-1.2.5-lfs-decls.patch
+++ /dev/null
@@ -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));