From 3b76fe6d4f40ccd9d35d2f9666ccd8ec4b0c5d8e Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 20 Oct 2011 05:04:41 -0600 Subject: [PATCH] zlib: apply zlib-1.2.5-lfs-decls.patch (from Arch) --- srcpkgs/zlib/depends | 2 +- srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch | 13 +++++++++++++ srcpkgs/zlib/template | 2 +- srcpkgs/zlib/zlib-devel.template | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch diff --git a/srcpkgs/zlib/depends b/srcpkgs/zlib/depends index 279bbc74c43..e9b02ccc721 100644 --- a/srcpkgs/zlib/depends +++ b/srcpkgs/zlib/depends @@ -1,2 +1,2 @@ abi_depends=">=1.2.3" -api_depends="${abi_depends}" +api_depends=">=1.2.5_2" diff --git a/srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch b/srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch new file mode 100644 index 00000000000..8c1be2b0d7a --- /dev/null +++ b/srcpkgs/zlib/patches/zlib-1.2.5-lfs-decls.patch @@ -0,0 +1,13 @@ +Index: zlib-1.2.5/zlib.h +=================================================================== +--- zlib.h ++++ 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)); diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template index 47bd4608a3c..0b7728b3f59 100644 --- a/srcpkgs/zlib/template +++ b/srcpkgs/zlib/template @@ -1,7 +1,7 @@ # Template build file for 'zlib' pkgname=zlib version=1.2.5 -revision=3 +revision=4 distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2" build_style=configure configure_args="--prefix=/usr --shared" diff --git a/srcpkgs/zlib/zlib-devel.template b/srcpkgs/zlib/zlib-devel.template index 01173f96bb6..2983a6d387f 100644 --- a/srcpkgs/zlib/zlib-devel.template +++ b/srcpkgs/zlib/zlib-devel.template @@ -5,7 +5,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 +revision=2 Add_dependency run glibc-devel Add_dependency run zlib