From c2362e8e8da28187d9bde7c03095ba390071a1cc Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 21 Sep 2011 12:42:19 +0000 Subject: [PATCH] dev-libs/quazip: Fix compilation against zlib-1.2.5.1-r1 (bug #383309) Package-Manager: portage-2.1.10.19/cvs/Linux x86_64 --- dev-libs/quazip/ChangeLog | 6 ++++- dev-libs/quazip/Manifest | 15 +++++++++-- dev-libs/quazip/files/quazip-0.4.3-zlib.patch | 27 +++++++++++++++++++ dev-libs/quazip/quazip-0.4.3-r1.ebuild | 9 +++++-- 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 dev-libs/quazip/files/quazip-0.4.3-zlib.patch 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 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/Manifest b/dev-libs/quazip/Manifest index b491e09d5068..d3bb68ec142f 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1,8 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX quazip-0.4.3-zlib.patch 821 RMD160 c0000efba772dd8b436398ea39d494ea11012ec2 SHA1 ba618f834628c63b1b2573236bc814f340debb5a SHA256 33295a7f6d21ec6a6bbc2b1900f1d1c34ec4895ab1b806058dedd96bcd577eaf DIST quazip-0.2.3.tar.gz 298712 RMD160 a648a37e965040d134c843bee15410bca2a5d12b SHA1 a091dcc3a4d57c2112bff65c2cac70f9f99fcded SHA256 355536fb47d822d705df5125db893f63eeae1148a45739786dbbfbafe9bad995 DIST quazip-0.3.tar.gz 161359 RMD160 0ac2b821937688b0c32547721332f1a7b41ec468 SHA1 dbb08bf3edf0d81771b373e2154d4f258070277e SHA256 a947889b9cfa15458e6f57739fb53ec4e3d6ff2d264c52036906bfa1121549c8 DIST quazip-0.4.3.tar.gz 268597 RMD160 04079ca71406814871b495fe0cf9348bc062a711 SHA1 c52e7d8ca1f667255636be4ad385d7dcfaa85454 SHA256 ef6353108149a11108087351f9f380b73b6cdc173be4f5442b9d0ae4fda5abad EBUILD quazip-0.2.3.ebuild 766 RMD160 42ba54e1b2cd0eea44c9bd2047879170f32330b1 SHA1 10a596816eb7209ecd250494aedfa54e6743d31b SHA256 c9c22fe2b395944e36bf413ba39bdafb536ae1e20e79e2cdb9285d75d1fd8e98 EBUILD quazip-0.3.ebuild 759 RMD160 809c8785e0e338e8051aa14513203895b30299a1 SHA1 44053c6ff974962c5bc51fa46f9918d6ab75ab8f SHA256 96fe715ad5d8a2b24dca4addcde5edab28452ea671e74451cabd23d539aa4f9f -EBUILD quazip-0.4.3-r1.ebuild 620 RMD160 70ab3bfded802c174e672bfb22c374c991cf5a99 SHA1 50861dfe3649a5dd12b3f5e2119da17b0fe5a627 SHA256 9dcf438aeab4ec44aba7c3e67d53ba114110b2ec8d874eb1c5d14f8f9c623b8c -MISC ChangeLog 997 RMD160 9c7ae3778297009c018581b8d07c4d37b538c313 SHA1 bc27ce29b37b5707c75e4d2a0308e7fc317b58a2 SHA256 81acc16416a1956bd8b51a3770496e7e4a10a23aeabb1b15f521f581f236506c +EBUILD quazip-0.4.3-r1.ebuild 721 RMD160 252aef0e475fafa1257c1f635472c54328e4b0ac SHA1 ef90b393c676759cd3a1f84c89b4200b30132ec1 SHA256 14fd1742ad889cfe938ceddc99d790123f76e0608f29e05ac63e9e0be3caf9ab +MISC ChangeLog 1160 RMD160 d2e94e4e6a6f5eee5b8e7c3a12a9de6f90e1a4bc SHA1 929345ba470635ff6c4442e80f86a18311627854 SHA256 3104c401776c537ed3743bfbe9a63aad7927d2c9a23a4373122b18492cd60b25 MISC metadata.xml 223 RMD160 0a01492a98435d0e6253aa712cdef8b0ad3422a2 SHA1 38dcb1297138e3539be360de7401fd091b49c1cb SHA256 070a9dafb8f5cbcfacc3921af8689ed008b6d8c845ddb2e4b475916f92ed4e0d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk5526wACgkQsAvGakAaFgCtswCfcwtOnv3Dpfl4z2lkx1Krp24u +Q2QAoJ6zMu8cWDSIc+VIKxa3UUgEOPU6 +=sXYU +-----END PGP SIGNATURE----- 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 +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 +} -- 2.26.2