diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /main/zlib | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-to-upstream.tar.bz2 aports-to-upstream.tar.xz | |
Merge remote branch 'upstream/master' into to-upstreamto-upstream
Diffstat (limited to 'main/zlib')
| -rw-r--r-- | main/zlib/APKBUILD | 16 | ||||
| -rw-r--r-- | main/zlib/gzflush.patch | 12 | ||||
| -rw-r--r-- | main/zlib/zlib-1.2.5-lfs-decls.patch | 13 |
3 files changed, 25 insertions, 16 deletions
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD index adf584ea..62d3ec49 100644 --- a/main/zlib/APKBUILD +++ b/main/zlib/APKBUILD @@ -1,15 +1,22 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zlib -pkgver=1.2.4 -pkgrel=0 +pkgver=1.2.5 +pkgrel=1 pkgdesc="A compression/decompression Library" license=custom:zlib url="http://zlib.net" depends= -source="http://zlib.net/$pkgname-$pkgver.tar.gz" +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() { cd "$_builddir" # we trade size for a little more speed. @@ -31,4 +38,5 @@ dev() { mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a } -md5sums="47f6ed51b3c83a8534f9228531effa18 zlib-1.2.4.tar.gz" +md5sums="c735eab2d659a96e5a594c9e8541ad63 zlib-1.2.5.tar.gz +4cb279ea3beab621f3526bf7b7ab99e5 zlib-1.2.5-lfs-decls.patch" diff --git a/main/zlib/gzflush.patch b/main/zlib/gzflush.patch deleted file mode 100644 index 5e97e657..00000000 --- a/main/zlib/gzflush.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gzwrite.c 2010-01-18 21:18:27.000000000 +0100 -+++ b/gzwrite.c 2010-01-28 04:37:20.330530306 +0100 -@@ -435,7 +435,8 @@ - state = (gz_statep)file; - - /* check that we're writing and that there's no error */ -- if (state->mode != GZ_WRITE|| state->err != Z_OK) -+ if (state->mode != GZ_WRITE || state->err != Z_OK) -+ return Z_STREAM_ERROR; - - /* check flush parameter */ - if (flush < 0 || flush > Z_FINISH) diff --git a/main/zlib/zlib-1.2.5-lfs-decls.patch b/main/zlib/zlib-1.2.5-lfs-decls.patch new file mode 100644 index 00000000..36e26af0 --- /dev/null +++ b/main/zlib/zlib-1.2.5-lfs-decls.patch @@ -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)); |