Fix missing zlib.h include for Z_DEFAULT_COMPRESSION after libpng headers got cleaned up.

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

4 files changed, 34 insertions, 9 deletions

diff --git a/games-strategy/naev/ChangeLog b/games-strategy/naev/ChangeLog
index ff552af15286..09e5e7843309 100644
--- a/games-strategy/naev/ChangeLog
+++ b/games-strategy/naev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/naev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/naev/ChangeLog,v 1.6 2011/07/19 20:08:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/naev/ChangeLog,v 1.7 2011/07/29 19:42:07 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> naev-0.5.0.ebuild,
+  +files/naev-0.5.0-libpng15.patch:
+  Fix missing zlib.h include for Z_DEFAULT_COMPRESSION after libpng headers got
+  cleaned up.
 
   19 Jul 2011; Markus Meier <maekke@gentoo.org> naev-0.5.0.ebuild:
   amd64/x86 stable, bug #375489
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 1e473048253e..d09865d1d95b 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX naev-0.5.0-libpng15.patch 392 RMD160 f7ea16127208acb028a75317d9968dcb0653f437 SHA1 eba88bb99a1768d62bc06a95faa83eb043711b67 SHA256 34a9d377614c2664eec82dacabf9c6389c49d489a8bbc3876e50b3bf1dacd909
 DIST naev-0.4.2.tar.bz2 633072 RMD160 c2d6e67e2b881923592adecc97af257a5d0bce17 SHA1 ff9928c8196c23bcfd35117989b23278c7ec1331 SHA256 91724f57591198a5bc1bc47518779b10bfb58251ed8dd2de63d7ece18deff1b2
 DIST naev-0.5.0.tar.bz2 905700 RMD160 fc3a073843b3f8c90ceeb00b772fb951f741ccb8 SHA1 b10fe0b740909785ec74c84c6a0ebafc29a870e6 SHA256 cbaa09d036188a22c0c9c70f1db6e00923b138ff897cdd37072adf4a438a503d
 DIST ndata-0.4.2 140366052 RMD160 b0ed6fcf443fa4c3aa2ac7e16927b5b42fbc7d78 SHA1 4a1da953cbf4ccf90e44151849afff05f2cfdc3b SHA256 3e1f4dc1c7f99fd3fb42c3a966f1fc3f4ac9fcdcedf25326d12c25200414dbf8
 DIST ndata-0.5.0 227724242 RMD160 82db2c1ff58c1d90c04f9451ab820476f20764a3 SHA1 dfee04fd9087e48377f72a3d92a704eb04a38d3d SHA256 269be8d7ba0e39a79a57ecf26fbb85e642eab7b0566dab0c2c7268bf56ef0550
 EBUILD naev-0.4.2.ebuild 1519 RMD160 8c73d770359a4cb1867e6e697c04a78fb2be253f SHA1 c81e771983f913b7be008e665fce518d9129aefb SHA256 74bebeb5cd3e72cf327f0e2747cf309610caf9bfc1bac57ddf670064940a5147
-EBUILD naev-0.5.0.ebuild 1773 RMD160 00f7a68ae40104b57d650fd40a8620e47d040e1a SHA1 7e4f4b9e9eea1b3ca0b3deeb7a04c72f036e30ac SHA256 d41c218517b96da074cf7c0ca80b38282deea03a4e238510df8b24d47426f65b
-MISC ChangeLog 971 RMD160 223194f13b4bf22b9416a8e0e0ed157a5091ed9f SHA1 e6a27f402fdc047d1655792ac6e1dc4a690bc18b SHA256 80187c869764407cd60173b55b1157272cd199dedd3e10ca84d37fb190949470
+EBUILD naev-0.5.0.ebuild 1844 RMD160 445de823df3de476af8ff84cd9d05b665a1051ea SHA1 c1cba7b9bcc7f8eadc4d348859508a31aca2187b SHA256 14b491d15ae5bacf328b73a589e6f099508ec2c16b749c7a41f436bf7c099cfe
+MISC ChangeLog 1178 RMD160 ae7b46d22db5115977811e3f5cee2d76c140b2d6 SHA1 4a888c32fa110e77f42a7978dce73a1a72bbb7e8 SHA256 f9f03da066605d696a8c043c0489d4868185e0b5fd13f4e0aeb3ecb1c1278c62
 MISC metadata.xml 308 RMD160 f7395452605fcfcef405f50aa9e1707b889d18fa SHA1 b384f1d04a9cc84d68ec05ca0798a401b5b259d7 SHA256 f390ca2a4fec9b2be7a9fd5fa114aaf24f334a614a935f5a13c6ea340aeea145
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4l5E4ACgkQkKaRLQcq0GJxwwCgomAQ1e3UUtKal8CQxdwqtyGo
-IIEAoLK/m/u/FvL6ihobKNqZMrE+nF3E
-=59JL
+iF4EAREIAAYFAk4zDI0ACgkQXkR9YqOcLPFSowEAjnN/q/rm0AbpYGIAXSt4mlzc
+/fvqFFJBx1X2C077QwUA/1ezuq+ABNuILxJYIdh0nZfw3q1igRsU5DZ5x9xT8EgW
+=REp2
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/naev/files/naev-0.5.0-libpng15.patch b/games-strategy/naev/files/naev-0.5.0-libpng15.patch
new file mode 100644
index 000000000000..1d144af45c5a
--- /dev/null
+++ b/games-strategy/naev/files/naev-0.5.0-libpng15.patch
@@ -0,0 +1,15 @@
+http://code.google.com/p/naev/issues/detail?id=129
+
+opengl.c: In function ‘write_png’:
+opengl.c:820:39: error: ‘Z_DEFAULT_COMPRESSION’ undeclared (first use in this function)
+
+--- src/opengl.c
++++ src/opengl.c
+@@ -39,6 +39,7 @@
+ #include <string.h>
+ #include <stdarg.h> /* va_list for gl_print */
+ 
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
+ #include <png.h>
+ 
+ #include "SDL.h"
diff --git a/games-strategy/naev/naev-0.5.0.ebuild b/games-strategy/naev/naev-0.5.0.ebuild
index b03b9fd75f13..bf63981b6c8b 100644
--- a/games-strategy/naev/naev-0.5.0.ebuild
+++ b/games-strategy/naev/naev-0.5.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/naev/naev-0.5.0.ebuild,v 1.2 2011/07/19 20:08:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/naev/naev-0.5.0.ebuild,v 1.3 2011/07/29 19:42:07 ssuominen Exp $
 
 EAPI=2
-inherit gnome2-utils games
+inherit eutils gnome2-utils games
 
 DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
 HOMEPAGE="http://code.google.com/p/naev/"
@@ -32,6 +32,10 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
 src_configure() {
 	egamesconf \
 		--docdir=/usr/share/doc/${PF} \