Fix building with libpng14 wrt #308651 by Locke Shinseiko (Wizzleby).

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

4 files changed, 54 insertions, 6 deletions

diff --git a/games-action/extreme-tuxracer/ChangeLog b/games-action/extreme-tuxracer/ChangeLog
index 28cd96559c90..ca91227dc9fd 100644
--- a/games-action/extreme-tuxracer/ChangeLog
+++ b/games-action/extreme-tuxracer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/extreme-tuxracer
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/ChangeLog,v 1.7 2009/08/22 07:33:10 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/ChangeLog,v 1.8 2010/03/09 18:30:55 ssuominen Exp $
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  extreme-tuxracer-0.5_beta.ebuild,
+  +files/extreme-tuxracer-0.5_beta-libpng14.patch:
+  Fix building with libpng14 wrt #308651 by Locke Shinseiko (Wizzleby).
 
 *extreme-tuxracer-0.5_beta (22 Aug 2009)
 
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index eff767ab5d5d..ef1c2c7e8691 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,7 +1,8 @@
+AUX extreme-tuxracer-0.5_beta-libpng14.patch 1441 RMD160 b6d097f11a67ffd0678d6bd8e1703f86ecf28e24 SHA1 8226e2ebd255770936ea6f4233fe636d9a425a74 SHA256 bbef6acae974ca1064dfecc4f7338c7c2ce65cb56fda74dd79d8911049dba58c
 AUX extreme-tuxracer.svg 9151 RMD160 c67a7858f40ed6564f3ce6b46c517b59bda28bac SHA1 f3cc3e9d6a6a9565c8692751ef5a63b07c5f83bb SHA256 f30dbfb4651ebc4c54feb7885a4d856f890652d6e3a06b15e04904ea65fd5136
 DIST extremetuxracer-0.4.tar.gz 28749072 RMD160 69a1433e7fef2e8b0eeb27c17002ef3d74dc0a44 SHA1 db5e55b5780dc2578d8c80d0ce48354b99bb53cf SHA256 5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d
 DIST extremetuxracer-0.5beta.tar.gz 43524138 RMD160 6f3bf00f792a765063cb97f691df82369157fcca SHA1 8c86186fa633b77d70722e84ab5a441ff0550452 SHA256 ba7fa156361cc6015ad2a1563ec7f05cdbf701f75177795562b528ebb44ba911
 EBUILD extreme-tuxracer-0.4.ebuild 932 RMD160 ae0000d32b04e6fc760b8198ac91e10b6360e929 SHA1 b4c65c58f0a2beb59241c55771c54f5aec2c2d44 SHA256 6ae8cca43a3445cb870d73fd0513fd00d02fee1ba21704de0b009a3992463a26
-EBUILD extreme-tuxracer-0.5_beta.ebuild 1261 RMD160 a362d90c924781c579bc9100d2dd15cee39e3fc6 SHA1 2afba2f90364ae034a75b4afbe547094f8900fd7 SHA256 19533db90bf2751c84ce2a650c180e22f7d7cf988b5c557e136fe502f6f5f1ba
-MISC ChangeLog 1396 RMD160 69195f94c10a25430de50e0878ce2630d0f02b6f SHA1 b7524138f5d308b307fe14fd7952c3633e96c111 SHA256 eaf876c2d18ed743ef50cda615e1a0cb3d2b0a02d9d5429747c1efcd376a134b
+EBUILD extreme-tuxracer-0.5_beta.ebuild 1304 RMD160 845aba155eedf19a4ab91760593b106d6e03dafd SHA1 b24ce42846ae207bed2ffd2cea097d9d8f08dd03 SHA256 ac3826b20e6245c9edd4eb178ef787dd6955b36ae9b07bf4f8790bdad37d2cec
+MISC ChangeLog 1610 RMD160 06b4141a5dfddf7e8697caaeda315133f3a3ef48 SHA1 63debd2b36270355bbe500c496d05580ddcdca54 SHA256 9ff2c89386ff8b9ac59fdd594ef1db6736cea21fb271c18e689186d470847eeb
 MISC metadata.xml 346 RMD160 2cdc09baef144510efecbc4985615673e1a23f02 SHA1 dec611b08f0f85058d12aa22eb7f83329a267a4f SHA256 811f0ea7e4f9d82fdf3d2e75dfcccbb081e2cb5e7b2da1121d87d18733149daa
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
index 47e97b1292b0..8da84def10c4 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild,v 1.1 2009/08/22 07:33:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild,v 1.2 2010/03/09 18:30:55 ssuominen Exp $
 
 EAPI=2
 inherit eutils games
@@ -35,6 +35,8 @@ src_prepare() {
 		-e '/^localedir/s:=.*:=@localedir@:' \
 		src/Makefile.in \
 		|| die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 }
 
 src_configure() {
diff --git a/games-action/extreme-tuxracer/files/extreme-tuxracer-0.5_beta-libpng14.patch b/games-action/extreme-tuxracer/files/extreme-tuxracer-0.5_beta-libpng14.patch
new file mode 100644
index 000000000000..020fd9b872d1
--- /dev/null
+++ b/games-action/extreme-tuxracer/files/extreme-tuxracer-0.5_beta-libpng14.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/show_bug.cgi?id=308651
+
+--- src/ppgltk/images/png_reader.cpp
++++ src/ppgltk/images/png_reader.cpp
+@@ -77,7 +77,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
+ 	
+ 	
+ 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++       &bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL);
+ 	
+ 	if(bit_depth == 16)
+         png_set_strip_16(png_ptr);
+@@ -88,7 +88,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
+ 		png_set_expand(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL);
+ 	}
+ 	
+ 	if( color_type == PNG_COLOR_TYPE_GRAY ||
+@@ -96,7 +96,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
+ 		png_set_gray_to_rgb(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL);
+ 	}
+ 		
+ 	this->width=width;
+@@ -114,7 +114,7 @@ ReaderPNG::ReaderPNG(const char *fileNam
+ 	}
+ 	
+ 	png_read_end(png_ptr, info_ptr);
+-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	fclose(fp);
+ }
+