diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-14 12:42:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-14 12:42:13 +0000 |
| commit | 00b6d3eac9db51b03e0c3ce62e1a1d16f8a0d29b (patch) | |
| tree | f2970f7dac27f674f54a8848fcffa2554af05fc8 /main | |
| parent | 0ada67ec8947b79b168c1d717e5ccd939eb29f59 (diff) | |
| download | aports-00b6d3eac9db51b03e0c3ce62e1a1d16f8a0d29b.tar.bz2 aports-00b6d3eac9db51b03e0c3ce62e1a1d16f8a0d29b.tar.xz | |
main/zlib: header fixes
fixes cgit and possibly libxml2
Diffstat (limited to 'main')
| -rw-r--r-- | main/zlib/APKBUILD | 14 | ||||
| -rw-r--r-- | main/zlib/gzflush.patch | 12 | ||||
| -rw-r--r-- | main/zlib/zlib-1.2.5-lfs-decls.patch | 13 |
3 files changed, 24 insertions, 15 deletions
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD index 1f4465a98..62d3ec49d 100644 --- a/main/zlib/APKBUILD +++ b/main/zlib/APKBUILD @@ -1,15 +1,22 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zlib pkgver=1.2.5 -pkgrel=0 +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="c735eab2d659a96e5a594c9e8541ad63 zlib-1.2.5.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 5e97e6573..000000000 --- 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 000000000..36e26af03 --- /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)); |