Fixed compilation with latest zlib

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 38 insertions, 11 deletions

diff --git a/games-util/xqf/ChangeLog b/games-util/xqf/ChangeLog
index abe027640782..8e329dd8add6 100644
--- a/games-util/xqf/ChangeLog
+++ b/games-util/xqf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/xqf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.32 2011/06/14 19:36:52 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.33 2011/10/31 00:55:56 polynomial-c Exp $
+
+  31 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> xqf-1.0.5.ebuild,
+  +files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch:
+  non-maintainer commit: Fixed compilation with latest zlib.
 
   14 Jun 2011; Tupone Alfredo <tupone@gentoo.org> xqf-1.0.5.ebuild,
   +files/xqf-1.0.5-underlink.patch:
@@ -156,7 +160,7 @@
   fix sourceforge mirroring.
 	  
   13 April 2002; Bart Verwilst <verwilst@gentoo.org>: just added a 
-  description, and cleaned up the $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.32 2011/06/14 19:36:52 tupone Exp $
+  description, and cleaned up the $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.33 2011/10/31 00:55:56 polynomial-c Exp $
 
 *xqf-0.9.8 (6 Apr 2002)
 
diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest
index 88c2eb2b1403..8906967f7ce4 100644
--- a/games-util/xqf/Manifest
+++ b/games-util/xqf/Manifest
@@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX xqf-1.0.5-cpu-overrun.patch 637 RMD160 79527fbce64fd5744e2ef23f796e6a42147b662b SHA1 e98ce041c29e0a11f7da52b4dd70ee054e685962 SHA256 e0f86eba813ce6314d55d1d68f58e2f5290629790df1cbbc704f11f636413412
 AUX xqf-1.0.5-underlink.patch 346 RMD160 d96eecb7c3fd58a9c4732d4f7a41b150b3f832b9 SHA1 516a684bc073c6136c624579be822bce4777c691 SHA256 aa3b28158d12da4845a211dc6a64962f24db137cd27c40b913f7a067797be179
+AUX xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch 190 RMD160 bcad2cb2dc77a65f2536c15d99489659f9bea1cd SHA1 53eff19c1266cf3ac08ef661a7b51ec84e645cad SHA256 b2db4c327f1667613ce7d0eb51ee021d305bc1bdcd108ffc5d1330e43c50e77a
 DIST xqf-1.0.5.tar.gz 742183 RMD160 159b9cd02a15fe3b1afd78952152adf5aaafc0c2 SHA1 052351ff26cf2f79f6bc2de5aacf63e76a02eb62 SHA256 ee0ab9a40516c55d9f00e65ab06b1c6669f0de858bc8a7416e6993a76c0d9b67
-EBUILD xqf-1.0.5.ebuild 1023 RMD160 6f8d27fe0c29998f0fab4ad60f59aeaa4fe98475 SHA1 899a80f2402129abd0a864ad52209703e43a67bc SHA256 fb38ff849cef62843bf98322f1c63c90113606b0ea22b10d52cb71f4c9160635
-MISC ChangeLog 5279 RMD160 95c56d5a1d37cfce26f8049978d600bdfcd1aaa1 SHA1 2f0ccc14681ae56d13978ae2c051249ca9588187 SHA256 28c1dddf167b877b1c2257a8f039cc6de1f7ee9b4232772b806f52bc4712ae66
+EBUILD xqf-1.0.5.ebuild 1081 RMD160 12d9d999de51e06472d28388db6c691f381259cd SHA1 68efca32414d735496263702b006695c14c2c7d7 SHA256 d577ff2366eb71d95dd55a1081aa15f7e99c78f7ad38b63b12fde598735ac0a9
+MISC ChangeLog 5476 RMD160 2b5280a65596e01e408b814a5a416e8a7f01500d SHA1 4df7e1ef450292af1143674e550482b0cdb778bb SHA256 2dd687bd32603a1d518e30c66f307f5577bba148f607ff669e14e0aae791139f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk33uF4ACgkQIY77eQFFFC2+vQCfavt7a59zdj0dRVgOhfp74TP3
-PN4AoODGBuLFqOCNbG7BsQmJY4Jcv7Rg
-=pdw2
+iQIcBAEBCgAGBQJOrfIhAAoJEPiazRVxLXTFY8gQAJ0SFgny5iFa2QeLuGaFDqT9
+KuuMMhfoMfzzcTR17Gos/Wh3SS8eGu3SuDRmIK0j288BzG5d6qRx2zFqPIWs6JMK
+P8SS6POQP9GZYSFc2rp94RfSVaf3lVx7M0H/ZE0nBqQyOXSx1m0doCygTN8uKO0H
+XRK9kEHwhLY6y19eLxf0tOOsIkOvTeq6DDEoPeg1UpMjsTunwKBD803+qDFtDJZ4
+SbYDqPmAUDtDEUJ2BM3YVbi343Ryx39eCD4j9tC4SB4J/uHcZs5LbDNTv9SkXjip
+fRQ40OWmBj6SiTKAl+PJMGtjLabLleqMYiFljMQ0/yZQbLJE+E0IJ2gLCTAa3j6e
+YldpdKUYrGFByZghdA1gEObtUanEXy04IM1Kz5llnXHrXrfQjjr44AeGZPRgK0Cd
+O4E0I/diKSvMSHtxR/YPOU8YckkUn7rkLmJStLqzNJBDbDtha/Xl04Mz7yz5odrs
+dALJOzFzEi9X4LELaq7Bnhuy5GAh1Vs4xMylKokRFeF143ahJk3digXf4gIO9rKQ
+D3dKDPrhhO6Dyw62UQYe8qFhBDUuSubm+LI3E46TAAIKSEn263dkUC21FrEwkg1B
+dIIYJzA6YRuSNib6lRi+4+aKSOxu64iB8grLxzESOQb+HcYZMspYmcGzAh2j3VYV
+U8NTGr5ODXpliNkKo+Uo
+=cfrL
 -----END PGP SIGNATURE-----
diff --git a/games-util/xqf/files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch b/games-util/xqf/files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch
new file mode 100644
index 000000000000..9bd433b3b27e
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.5-zlib-1.2.5.1-compile-fix.patch
@@ -0,0 +1,11 @@
+--- xqf-1.0.5/src/zip/ioapi.h
++++ xqf-1.0.5/src/zip/ioapi.h
+@@ -6,6 +6,8 @@
+    Copyright (C) 1998-2003 Gilles Vollant
+ */
+ 
++#define OF(x) x
++
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 
diff --git a/games-util/xqf/xqf-1.0.5.ebuild b/games-util/xqf/xqf-1.0.5.ebuild
index 80f185b74dd0..5cb7923ed16e 100644
--- a/games-util/xqf/xqf-1.0.5.ebuild
+++ b/games-util/xqf/xqf-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/xqf-1.0.5.ebuild,v 1.9 2011/06/14 19:36:52 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/xqf-1.0.5.ebuild,v 1.10 2011/10/31 00:55:56 polynomial-c Exp $
 
 EAPI=2
 inherit base eutils
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 
 # bug #288853
 PATCHES=( "${FILESDIR}"/${P}-cpu-overrun.patch
-	"${FILESDIR}"/${P}-underlink.patch )
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch )
 
 src_configure() {
 	econf \