diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2011-09-21 12:42:19 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2011-09-21 12:42:19 +0000 |
| commit | 1e3e180fd1a074b9868f4fa20688bcf76f357475 (patch) | |
| tree | 5df3660cafdc4ab71a30099a9b0bba7a96a60fbb /dev-libs | |
| parent | x86 stable, see bug 329693 (diff) | |
| download | gentoo-2-1e3e180fd1a074b9868f4fa20688bcf76f357475.tar.gz gentoo-2-1e3e180fd1a074b9868f4fa20688bcf76f357475.tar.bz2 gentoo-2-1e3e180fd1a074b9868f4fa20688bcf76f357475.zip | |
dev-libs/quazip: Fix compilation against zlib-1.2.5.1-r1 (bug #383309)
(Portage version: 2.1.10.19/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/quazip/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/quazip/files/quazip-0.4.3-zlib.patch | 27 | ||||
| -rw-r--r-- | dev-libs/quazip/quazip-0.4.3-r1.ebuild | 9 |
3 files changed, 39 insertions, 3 deletions
diff --git a/dev-libs/quazip/ChangeLog b/dev-libs/quazip/ChangeLog index 3873b06c5082..23bbeeea955c 100644 --- a/dev-libs/quazip/ChangeLog +++ b/dev-libs/quazip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/quazip # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/ChangeLog,v 1.6 2011/09/13 21:30:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/ChangeLog,v 1.7 2011/09/21 12:42:19 sping Exp $ + + 21 Sep 2011; Sebastian Pipping <sping@gentoo.org> quazip-0.4.3-r1.ebuild, + +files/quazip-0.4.3-zlib.patch: + Fix compilation against zlib-1.2.5.1-r1 (bug #383309) *quazip-0.4.3-r1 (13 Sep 2011) diff --git a/dev-libs/quazip/files/quazip-0.4.3-zlib.patch b/dev-libs/quazip/files/quazip-0.4.3-zlib.patch new file mode 100644 index 000000000000..5cefdf010416 --- /dev/null +++ b/dev-libs/quazip/files/quazip-0.4.3-zlib.patch @@ -0,0 +1,27 @@ +From f7d821a6837b4cc9defa02f271256796394fd8c3 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Wed, 21 Sep 2011 14:37:31 +0200 +Subject: [PATCH] Allow compilation with zlib-1.2.5.1-r1 + +--- + quazip/ioapi.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/quazip/ioapi.h b/quazip/ioapi.h +index 716dd4b..a4ac8d7 100644 +--- a/quazip/ioapi.h ++++ b/quazip/ioapi.h +@@ -37,6 +37,10 @@ + extern "C" {
+ #endif
+
++#ifndef OF
++# define OF(x) x
++#endif
++
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode));
+ typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+-- +1.7.6.1 + diff --git a/dev-libs/quazip/quazip-0.4.3-r1.ebuild b/dev-libs/quazip/quazip-0.4.3-r1.ebuild index 8cb9aeb45ed3..6f48071bfdb6 100644 --- a/dev-libs/quazip/quazip-0.4.3-r1.ebuild +++ b/dev-libs/quazip/quazip-0.4.3-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.4.3-r1.ebuild,v 1.2 2011/09/13 23:03:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.4.3-r1.ebuild,v 1.3 2011/09/21 12:42:19 sping Exp $ EAPI=4 -inherit multilib cmake-utils +inherit eutils multilib cmake-utils DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package" HOMEPAGE="http://quazip.sourceforge.net/" @@ -22,3 +22,8 @@ RDEPEND="${DEPEND}" S="${WORKDIR}"/${P} DOCS="NEWS README.txt" + +src_prepare() { + # Support zlib-1.2.5.1-r1 (bug #383309) + epatch "${FILESDIR}"/${P}-zlib.patch +} |