Patch for gcc-4.2

Package-Manager: portage-2.1.2.9

4 files changed, 44 insertions, 13 deletions

diff --git a/games-roguelike/scourge/ChangeLog b/games-roguelike/scourge/ChangeLog
index 82e171f4d0ce..bd9d363a9e41 100644
--- a/games-roguelike/scourge/ChangeLog
+++ b/games-roguelike/scourge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/scourge
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.25 2007/06/01 01:23:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.26 2007/06/13 22:44:18 nyhm Exp $
+
+  13 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/scourge-0.18-gcc42.patch, scourge-0.18.ebuild:
+  Patch for gcc-4.2
 
 *scourge-0.18 (01 Jun 2007)
 
diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest
index 3cc808c65bb1..06afb9efd33b 100644
--- a/games-roguelike/scourge/Manifest
+++ b/games-roguelike/scourge/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX scourge-0.18-gcc42.patch 503 RMD160 f593c9966bda7a5abd3e4332b7ae024d9a9789de SHA1 8853b90036734ba8fa5c77b712f8626bcd942c7a SHA256 ce4ed3d495d3680c18288e6db20b8849dfe31361a989127b6a7a70343c01af5c
+MD5 a8cdae7fe1b284d19aaefb80448e5efd files/scourge-0.18-gcc42.patch 503
+RMD160 f593c9966bda7a5abd3e4332b7ae024d9a9789de files/scourge-0.18-gcc42.patch 503
+SHA256 ce4ed3d495d3680c18288e6db20b8849dfe31361a989127b6a7a70343c01af5c files/scourge-0.18-gcc42.patch 503
 DIST scourge-0.17.data.tar.gz 77257508 RMD160 d345bd37ae9f85f8890b9b420ab884b74d4b2761 SHA1 77a573a03184d2eae51fe3de954b6f7dd6224dd6 SHA256 8a4edcba61e28d60344cb66105f670a7e5f7a231a765bca419b6390f7c052980
 DIST scourge-0.17.src.tar.gz 1141012 RMD160 5cc649148ac5693f4fd3aeb16f27dcb45fca209e SHA1 de3e257e47c5fc4ce66429489efb35b080fbb28d SHA256 0094fb3aa0d0d3e4de0c643705d8a0df2a7ebb6102e064f588ba78cd9e17164c
 DIST scourge-0.18.data.tar.gz 79186848 RMD160 449900de6c680d5e6350bd28f231ccffeb044110 SHA1 e528446945ce2619cfdc3411e1fe97378451fc32 SHA256 95a6c165576e4968b919afc2cd6c1663271c5de749d517e23c920db192308410
@@ -9,14 +13,14 @@ EBUILD scourge-0.17.ebuild 1539 RMD160 ff246b8f2e229cda0755e5eeeb42bc2bbd866656
 MD5 adf234a2aa7c95314fe079d3d005c9ef scourge-0.17.ebuild 1539
 RMD160 ff246b8f2e229cda0755e5eeeb42bc2bbd866656 scourge-0.17.ebuild 1539
 SHA256 f07f750fe86ca32dbaba486bbf05e2e6e459b4a8b50b0f02a3904b44c285a07a scourge-0.17.ebuild 1539
-EBUILD scourge-0.18.ebuild 1620 RMD160 8c71e9168f3ec69b76f5f4105ae0b64370dbeeed SHA1 870d783a886058e4046bc6624187276b445df6e3 SHA256 8c2264e0210ecf270e0f7001f25741a579c9d455732d360547c299fd6e40f311
-MD5 9ef770d325dcbd3a47057bcf7fa14a0e scourge-0.18.ebuild 1620
-RMD160 8c71e9168f3ec69b76f5f4105ae0b64370dbeeed scourge-0.18.ebuild 1620
-SHA256 8c2264e0210ecf270e0f7001f25741a579c9d455732d360547c299fd6e40f311 scourge-0.18.ebuild 1620
-MISC ChangeLog 3122 RMD160 40a6e803a1af1f1ed41a12864aba67e82a4675c8 SHA1 623262d42b77175ea3ce04e4668789806d7f3939 SHA256 a416129592a67e8dad8e569dc956fb450e8de97c5bc9a4dac0427ce93c735df2
-MD5 f5b2fbff9c4d8bc960c272202a03af0f ChangeLog 3122
-RMD160 40a6e803a1af1f1ed41a12864aba67e82a4675c8 ChangeLog 3122
-SHA256 a416129592a67e8dad8e569dc956fb450e8de97c5bc9a4dac0427ce93c735df2 ChangeLog 3122
+EBUILD scourge-0.18.ebuild 1659 RMD160 7358788736cde0b461bf5a36595da96103b675bd SHA1 17fbd45daadac9a75e5710c446abbc3b4c4137a7 SHA256 73c64780ee4bb0aad1edf898286d901ed9d07462a4c2c6509d5210387725beab
+MD5 4e7343083dc8be3a9a434fc9aaeeb931 scourge-0.18.ebuild 1659
+RMD160 7358788736cde0b461bf5a36595da96103b675bd scourge-0.18.ebuild 1659
+SHA256 73c64780ee4bb0aad1edf898286d901ed9d07462a4c2c6509d5210387725beab scourge-0.18.ebuild 1659
+MISC ChangeLog 3247 RMD160 bbf851ad85cdc8ff0c3d63e21e5314e9cc1f8919 SHA1 89da88cd12a711b9b09c9f61b092de1a1a2a9247 SHA256 405cbceaaa7f4fa195114ef312c78e3fafb81bddeacf54b1818bb035249b493d
+MD5 6925d09a9c9945985ba2eb41fd81f5a0 ChangeLog 3247
+RMD160 bbf851ad85cdc8ff0c3d63e21e5314e9cc1f8919 ChangeLog 3247
+SHA256 405cbceaaa7f4fa195114ef312c78e3fafb81bddeacf54b1818bb035249b493d ChangeLog 3247
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -30,7 +34,7 @@ SHA256 8a16fb1fb749159e48f4c9939a1979bf1097a855f53dbd2eee8a41c27b1343a6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGX3Uodz7hIScOURERAs8hAJ0YCALOh0foh/d2QdoKiI6XIRi7xACgrLof
-DcdLfsr9TJLT8QjGAD247WI=
-=VoQu
+iD8DBQFGcHNPdz7hIScOURERAj8IAKCbaCY/Q6RU11w9W7us27LIZ42GjwCfR1Nb
+yu92R1aABFvtN+cWzOcZxrk=
+=MFoA
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/scourge/files/scourge-0.18-gcc42.patch b/games-roguelike/scourge/files/scourge-0.18-gcc42.patch
new file mode 100644
index 000000000000..e3ef9e8c86ce
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.18-gcc42.patch
@@ -0,0 +1,22 @@
+--- src/sdlhandler.cpp
++++ src/sdlhandler.cpp
+@@ -163,7 +163,7 @@
+ }
+ 
+ /* general OpenGL initialization function */
+-int SDLHandler::initGL( GLvoid ) {
++int SDLHandler::initGL( void ) {
+   /* Enable Texture Mapping */
+     glEnable( GL_TEXTURE_2D );
+       
+--- src/sdlhandler.h
++++ src/sdlhandler.h
+@@ -231,7 +231,7 @@
+ protected:	
+ 	bool popHandlers();
+ 	int resizeWindow( int width, int height );
+-	int initGL( GLvoid );  
++	int initGL( void );  
+ 	void drawCursor();
+ 
+ 	void drawScreenInternal();
diff --git a/games-roguelike/scourge/scourge-0.18.ebuild b/games-roguelike/scourge/scourge-0.18.ebuild
index db053ad05a1d..0a5245a7fc13 100644
--- a/games-roguelike/scourge/scourge-0.18.ebuild
+++ b/games-roguelike/scourge/scourge-0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.18.ebuild,v 1.1 2007/06/01 01:23:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.18.ebuild,v 1.2 2007/06/13 22:44:18 nyhm Exp $
 
 inherit autotools eutils wxwidgets games
 
@@ -41,6 +41,7 @@ src_unpack() {
 			-e "/WXWIDGET_LIBS/s:wx-config:${WX_CONFIG}:" \
 			configure.in || die "sed failed"
 	fi
+	epatch "${FILESDIR}"/${P}-gcc42.patch
 	eautoreconf
 }