From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 21 Oct 2011 13:32:59 +0000 (+0000)
Subject: Fix building with libpng15 (missing zlib.h include) wrt #387945 by "Jared"
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48ab5fd391bab1a7d9b8527c6670f757125088e9;p=gentoo.git

Fix building with libpng15 (missing zlib.h include) wrt #387945 by "Jared"

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

diff --git a/games-fps/qudos/ChangeLog b/games-fps/qudos/ChangeLog
index 2363b8b049e6..7db63348c509 100644
--- a/games-fps/qudos/ChangeLog
+++ b/games-fps/qudos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/qudos
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.12 2011/10/08 21:24:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.13 2011/10/21 13:32:59 ssuominen Exp $
+
+  21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> qudos-0.40.1.ebuild,
+  +files/qudos-0.40.1-libpng15.patch:
+  Fix building with libpng15 (missing zlib.h include) wrt #387945 by "Jared"
 
   08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> qudos-0.40.1.ebuild:
   Improve sys-libs/zlib handling.
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index 94f2ad31bfb2..41c6cec1f2ba 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX qudos-0.40.1-libpng15.patch 205 RMD160 13f0c0dbe5e58f62f926ab358dba8a9672726e7a SHA1 a5c583fa338616b5fcc5f0e670c07aca670a0bc9 SHA256 7364352d723d8f237a0340508a752894d1c51e43cb668e4b60cebd958dd6c97c
 DIST QuDos-0.40.1-src.tar.bz2 2031636 RMD160 998c9ff2f6ee702ed391946afd2924081cdb6976 SHA1 008ee5df6c0d3a1ed475ab2b373013970a570300 SHA256 90d8dbbbe4e006b4233b9c8c20bc3da5c240dde8fdf17ccf43ca533d296aa21a
 DIST QuDos-0.40.1.pk3 5253128 RMD160 21a2643300126753ae2a5f07597807e6f5a2a549 SHA1 982f91d17f369754906465bfe96bb2395cfc7f3f SHA256 c02e0df50785d5b360ec5435e2fd3d31b337f28f676b7af141a8e2664f518f1c
-EBUILD qudos-0.40.1.ebuild 4949 RMD160 a94fa397cb5502f29e56ae48c73dffad72745bb8 SHA1 c74e2dfbe4cb8f69e33d75dad989c05f994354ff SHA256 302c86dd812a83266e8a94a6784b2cf183b808dc3a9e9c401a2f70521cf30ea3
-MISC ChangeLog 1822 RMD160 60cef74ad520ce002362e69ce7e3c61f3a015ba6 SHA1 84ed76b62e78332f003e19ab5b858cc589821ddb SHA256 2ee619ebb8451a9dd76f045660576e7d4e49890da63df4d1bb2e8cc4f55067af
+EBUILD qudos-0.40.1.ebuild 4992 RMD160 c3e0b1a4ca4bf5e1949077e3c408a10a9a962847 SHA1 89210774ccb37684191a2934c19c4295ac76bb5d SHA256 cd081272747b86b4a36b6682b56bcf83927fb5d16cb2de5302ee16997a1322a6
+MISC ChangeLog 2013 RMD160 268de5a9277b1785b1ce342b809e64632823f03d SHA1 6031c9d4db36823a109a3c1b3ce6b220bbe02346 SHA256 31a2728918a59594025eafab6b3324ba870e39e274e180b244340527f9a74fa1
 MISC metadata.xml 488 RMD160 1a6bb96dde922755d33b65b721e79d4d8dab309b SHA1 b0435bdea92b49c65f71ff16b02795716ae85711 SHA256 8f2ca78e00c4b7f92c729835efb4100e2756fe88a362f7c4410388b28ff2d60a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkMATAAoJEEdUh39IaPFNK2MH/0nEIflmVSJljgZFqpnkv054
-ibE4kfU7YqiIUnXcXahmMGLLD9OWXREjU1ARiW3fYJcU501KB3vqzUDPWC0xt+EP
-V0i4qqt++if5peLvOtjI2qbdWWnTjXwsk/buhVX5i9T0JwRNWsKCW5Wp6jXxSfmC
-gIjJkc/jy0OTpfJSAeQG0sbr7MQweaM0bWcYIyfstUbeAPiOZuiTE8iN95zJKoRY
-jvVTeEIfI5aYUfbsihnuytJUEPwGds5pKBOG6Id0lDhwhEM8WNYU/9DvHqTkC7Mx
-hxqspB+KDs3sdaftf1ZS+3EErN1fxoMCpcV6gOdHkzkR9tU7KD6FJyz61uCbXRM=
-=zw65
+iQEcBAEBAgAGBQJOoXRpAAoJEEdUh39IaPFNmVIIAIVf/feuOTrCVNzw43OaWX3t
+OvpnGDvXp/xppb+kUpPy+SdnR3a4SV8i875s+nRaeq/PunS/SIf93iCemI1hXMtR
+riyY1/z2PiYi2Qa5X6+fDVl4BwibF4jYQY7G7HxEsMWY+0vg7c4dUlODkQ0jnkkx
+Dc0qRHvOtKPB8+I9z5gwsisyKaC5gZvLNzhbbpW1VXDs5g1nLHQt4osm4vpYaDcS
++Fl68oes+8yFOHzp9IYeW/SjQGBtySNUmKKehOk5GYQ4LFY/PK9N6rStmcMRo5Xb
+KQZAY8rhH5CYAgI/pGwL8jz4+zzntRfkKPUKVaVO90yuqKAbbvXKkicYhPe9xkw=
+=T/Ar
 -----END PGP SIGNATURE-----
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
new file mode 100644
index 000000000000..ecf9de9370e9
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
@@ -0,0 +1,10 @@
+--- src/ref_gl/gl_local.h
++++ src/ref_gl/gl_local.h
+@@ -29,6 +29,7 @@
+ #include <GL/glu.h>
+ #include <GL/glext.h>
+ 
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
+ #include <png.h>
+ #include <jpeglib.h>
+ 
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 8fc9b9d915dc..95b9e599efb3 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.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-fps/qudos/qudos-0.40.1.ebuild,v 1.15 2011/10/08 21:26:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.16 2011/10/21 13:32:59 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs games
@@ -116,6 +116,8 @@ src_prepare() {
 
 	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
 		sed -i -e '1i#define OF(x) x' src/qcommon/unzip/ioapi.h
+
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_compile() {