Fix for gcc-4.1, bug #132097

Package-Manager: portage-2.1_rc2-r1

5 files changed, 55 insertions, 24 deletions

diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog
index da6193370e4a..d5ce208a2568 100644
--- a/games-sports/trigger/ChangeLog
+++ b/games-sports/trigger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/trigger
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.10 2006/05/15 20:31:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.11 2006/05/23 21:48:57 tupone Exp $
+
+  23 May 2006; <Tupone@gentoo.org> +files/trigger-0.5.2-gcc41.patch,
+  trigger-0.5.2.ebuild, trigger-0.5.2-r1.ebuild:
+  Fix for gcc-4.1, bug #132097 by nyhm
 
 *trigger-0.5.2-r1 (15 May 2006)
 
diff --git a/games-sports/trigger/Manifest b/games-sports/trigger/Manifest
index 01f5df0296ba..4f5d7e125cc8 100644
--- a/games-sports/trigger/Manifest
+++ b/games-sports/trigger/Manifest
@@ -1,32 +1,39 @@
-AUX trigger-0.5.1c-glx-check.patch 590 RMD160 50dc898d7e31dc94eb43076f4027f485fcd8f443 SHA1 bb19c963876c10890846b7d03187d6cf3f3fb647 SHA256 42845b9e322cea9406e250e4cba80aa1825c4722c84834ca362747d7bcea8030 size 590
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX trigger-0.5.1c-glx-check.patch 590 RMD160 50dc898d7e31dc94eb43076f4027f485fcd8f443 SHA1 bb19c963876c10890846b7d03187d6cf3f3fb647 SHA256 42845b9e322cea9406e250e4cba80aa1825c4722c84834ca362747d7bcea8030
 MD5 fab012ed7b17d5eeb472e71a6c9c7c06 files/trigger-0.5.1c-glx-check.patch 590
 RMD160 50dc898d7e31dc94eb43076f4027f485fcd8f443 files/trigger-0.5.1c-glx-check.patch 590
 SHA256 42845b9e322cea9406e250e4cba80aa1825c4722c84834ca362747d7bcea8030 files/trigger-0.5.1c-glx-check.patch 590
-AUX trigger-0.5.2-freealut.patch 1164 RMD160 1da8767e11136b02ace9a536bb4ef26e6be47631 SHA1 40aa9774930c6a0ded7984d3418ed737091f9b10 SHA256 38c23c1f0a599454f7b5a373a7d233d588839584812e8a35327b230bbf1ef58b size 1164
+AUX trigger-0.5.2-freealut.patch 1164 RMD160 1da8767e11136b02ace9a536bb4ef26e6be47631 SHA1 40aa9774930c6a0ded7984d3418ed737091f9b10 SHA256 38c23c1f0a599454f7b5a373a7d233d588839584812e8a35327b230bbf1ef58b
 MD5 11b5b5c4e7e466719f3a0e5f5b870c59 files/trigger-0.5.2-freealut.patch 1164
 RMD160 1da8767e11136b02ace9a536bb4ef26e6be47631 files/trigger-0.5.2-freealut.patch 1164
 SHA256 38c23c1f0a599454f7b5a373a7d233d588839584812e8a35327b230bbf1ef58b files/trigger-0.5.2-freealut.patch 1164
-DIST trigger-0.5.1c-data.tar.bz2 6165837 size 6165837
-DIST trigger-0.5.1c-src.tar.bz2 259508 size 259508
-DIST trigger-0.5.2-data.tar.bz2 6189856 RMD160 945a6c491c3f490d5acdfe3ac3633d3ec839466c SHA256 2e922aa8117722c8524e4c63c3df79c368bae0fd1aeada6005c27c81d27de7a6 size 6189856
-DIST trigger-0.5.2-src.tar.bz2 333942 RMD160 af71c1e343d3eac20abe0c00257080fb592819b0 SHA256 0fbb4f62e8c6b09e268a523cc9dbdd211fbbe94e2a316961c3ea5c79fb327aca size 333942
-EBUILD trigger-0.5.1c.ebuild 1491 RMD160 2885a6c874aa8a669b7168c6b9c12ec3f33ff2af SHA1 042a31351840d4776bd73754d93075e1ccbc4f26 SHA256 40a6b06cccd52baa7ef2fedf3a9b1572a2fa2f09a1775310ffe1bf3c02fc71ea size 1491
+AUX trigger-0.5.2-gcc41.patch 279 RMD160 c21a158a0f9882e43002589aee13fdeaebe34d87 SHA1 cb9dbacadf870be10dd63a75d7bcd35546442a4f SHA256 86cafb5184da6c27373f3bffa8ce9083da6bd3c81faf9e17ba36ff3a3cdce44f
+MD5 d589cd47037849a9fc9377dc7929ae84 files/trigger-0.5.2-gcc41.patch 279
+RMD160 c21a158a0f9882e43002589aee13fdeaebe34d87 files/trigger-0.5.2-gcc41.patch 279
+SHA256 86cafb5184da6c27373f3bffa8ce9083da6bd3c81faf9e17ba36ff3a3cdce44f files/trigger-0.5.2-gcc41.patch 279
+DIST trigger-0.5.1c-data.tar.bz2 6165837
+DIST trigger-0.5.1c-src.tar.bz2 259508
+DIST trigger-0.5.2-data.tar.bz2 6189856 RMD160 945a6c491c3f490d5acdfe3ac3633d3ec839466c SHA1 2016262e3cbf4c8808c765c1e317fb3dda2a2a34 SHA256 2e922aa8117722c8524e4c63c3df79c368bae0fd1aeada6005c27c81d27de7a6
+DIST trigger-0.5.2-src.tar.bz2 333942 RMD160 af71c1e343d3eac20abe0c00257080fb592819b0 SHA1 57589368606ec1b4b972bb32fc62cca09af049b1 SHA256 0fbb4f62e8c6b09e268a523cc9dbdd211fbbe94e2a316961c3ea5c79fb327aca
+EBUILD trigger-0.5.1c.ebuild 1491 RMD160 2885a6c874aa8a669b7168c6b9c12ec3f33ff2af SHA1 042a31351840d4776bd73754d93075e1ccbc4f26 SHA256 40a6b06cccd52baa7ef2fedf3a9b1572a2fa2f09a1775310ffe1bf3c02fc71ea
 MD5 13baff2456a9cfcbf63a60e031ff6356 trigger-0.5.1c.ebuild 1491
 RMD160 2885a6c874aa8a669b7168c6b9c12ec3f33ff2af trigger-0.5.1c.ebuild 1491
 SHA256 40a6b06cccd52baa7ef2fedf3a9b1572a2fa2f09a1775310ffe1bf3c02fc71ea trigger-0.5.1c.ebuild 1491
-EBUILD trigger-0.5.2-r1.ebuild 1628 RMD160 ccfe759382a9c5c02d515d7d9d93d9607f486930 SHA1 37abfb4e8628dbb9319e8c3ec3717926a65e811f SHA256 4fbec03b8cc45e9969b48a3901797b39039c60f275bd46edf667591bb5052ccd size 1628
-MD5 9b2775a9bc937b5b0d2d36051ecd3b2b trigger-0.5.2-r1.ebuild 1628
-RMD160 ccfe759382a9c5c02d515d7d9d93d9607f486930 trigger-0.5.2-r1.ebuild 1628
-SHA256 4fbec03b8cc45e9969b48a3901797b39039c60f275bd46edf667591bb5052ccd trigger-0.5.2-r1.ebuild 1628
-EBUILD trigger-0.5.2.ebuild 1551 RMD160 2ca3a1b7a5169cf939c38ef1190d52657139a2a8 SHA1 86c2be22fc487625ec84206b643dd67a9a52e0a0 SHA256 29c17096ae3c360f0fa76f1aab3712b4892d141946afcf11677bfc553d15a5be size 1551
-MD5 051fb4f2147e73ed011027fbe678bb75 trigger-0.5.2.ebuild 1551
-RMD160 2ca3a1b7a5169cf939c38ef1190d52657139a2a8 trigger-0.5.2.ebuild 1551
-SHA256 29c17096ae3c360f0fa76f1aab3712b4892d141946afcf11677bfc553d15a5be trigger-0.5.2.ebuild 1551
-MISC ChangeLog 1738 RMD160 21e78b6c5774c359c0c247c4e3560124ca48902b SHA1 4f2f1cdeb3b456d08fac99127ed473a17e54153f SHA256 317a902d1177242261140a1090b195182164cc0085827730d11bda2e52551fa1 size 1738
-MD5 e07f038682b8c26f4271f85dcb857c75 ChangeLog 1738
-RMD160 21e78b6c5774c359c0c247c4e3560124ca48902b ChangeLog 1738
-SHA256 317a902d1177242261140a1090b195182164cc0085827730d11bda2e52551fa1 ChangeLog 1738
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+EBUILD trigger-0.5.2-r1.ebuild 1661 RMD160 a30bb21a71d5474100b7f6fe97a58c473f2a1c42 SHA1 cf4c1ae187ecd12a36865ab89bfd359992301e7a SHA256 344293b461ab938bc2012e9e0e093a893736eb3b317ab7fb53319762d2005a95
+MD5 52aee91a2b849f6a861582970e25abfd trigger-0.5.2-r1.ebuild 1661
+RMD160 a30bb21a71d5474100b7f6fe97a58c473f2a1c42 trigger-0.5.2-r1.ebuild 1661
+SHA256 344293b461ab938bc2012e9e0e093a893736eb3b317ab7fb53319762d2005a95 trigger-0.5.2-r1.ebuild 1661
+EBUILD trigger-0.5.2.ebuild 1583 RMD160 5efe4078de11e186c78082d220b8f017c5706524 SHA1 bd78e61ad0fddc15a27897cb7efb814c50aab592 SHA256 30133771a94865fb38558ae6236dd9aed16c19c548628fbdf1d13ca88e046c52
+MD5 183e20424fa8adc1d3b6374a403a1c23 trigger-0.5.2.ebuild 1583
+RMD160 5efe4078de11e186c78082d220b8f017c5706524 trigger-0.5.2.ebuild 1583
+SHA256 30133771a94865fb38558ae6236dd9aed16c19c548628fbdf1d13ca88e046c52 trigger-0.5.2.ebuild 1583
+MISC ChangeLog 1894 RMD160 2d9d125dbf104438a545235543756d77b4f3e106 SHA1 92bff0e3403396c215dd74a7d0eba30d72f9c4e8 SHA256 a081b5f408e77e9756391302a0a99eb0e63bbfc69b7658b80ab0a5810daa08d6
+MD5 4d0dfcd698dd23fd0b6cb2274f3e0b05 ChangeLog 1894
+RMD160 2d9d125dbf104438a545235543756d77b4f3e106 ChangeLog 1894
+SHA256 a081b5f408e77e9756391302a0a99eb0e63bbfc69b7658b80ab0a5810daa08d6 ChangeLog 1894
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
@@ -39,3 +46,10 @@ SHA256 a0ed004bff630f656c2e090b892f1d625f648b3458d778f259cce22c808baf2f files/di
 MD5 87f9ae9139f4c188b7c4f85b6ceb8231 files/digest-trigger-0.5.2-r1 518
 RMD160 1f7c5ce70c6fda01a424a92d50cd4f8e9fb141b9 files/digest-trigger-0.5.2-r1 518
 SHA256 a0ed004bff630f656c2e090b892f1d625f648b3458d778f259cce22c808baf2f files/digest-trigger-0.5.2-r1 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEc4NX2CTtIKiFlQIRAvDPAJ9jeQC9uEYFYx7CDCHyBkBkXXmAygCfV7Eo
+m+aBqh0052i1GzbZKSgXqyA=
+=3YQK
+-----END PGP SIGNATURE-----
diff --git a/games-sports/trigger/files/trigger-0.5.2-gcc41.patch b/games-sports/trigger/files/trigger-0.5.2-gcc41.patch
new file mode 100644
index 000000000000..316b936b042a
--- /dev/null
+++ b/games-sports/trigger/files/trigger-0.5.2-gcc41.patch
@@ -0,0 +1,11 @@
+--- src/pengine/tinyxml.h
++++ src/pengine/tinyxml.h
+@@ -805,7 +805,7 @@
+ #endif
+ 
+ 	/// Construct.
+-	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
++	TiXmlDeclaration( const char * _version,
+ 										const char * _encoding,
+ 										const char * _standalone );
+ 
diff --git a/games-sports/trigger/trigger-0.5.2-r1.ebuild b/games-sports/trigger/trigger-0.5.2-r1.ebuild
index a96a96679e23..4fc46d19b117 100644
--- a/games-sports/trigger/trigger-0.5.2-r1.ebuild
+++ b/games-sports/trigger/trigger-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.1 2006/05/15 20:31:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.2 2006/05/23 21:48:57 tupone Exp $
 
 inherit eutils games
 
@@ -43,7 +43,8 @@ src_unpack() {
 		src/glew/glew.cpp \
 		src/glew/GL/glxew.h \
 		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-freealut.patch
+	epatch "${FILESDIR}"/${P}-freealut.patch \
+		"${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {
diff --git a/games-sports/trigger/trigger-0.5.2.ebuild b/games-sports/trigger/trigger-0.5.2.ebuild
index 27eb55e54bf8..848a37a2b5bd 100644
--- a/games-sports/trigger/trigger-0.5.2.ebuild
+++ b/games-sports/trigger/trigger-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2.ebuild,v 1.2 2006/01/29 08:04:42 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2.ebuild,v 1.3 2006/05/23 21:48:57 tupone Exp $
 
 inherit eutils games
 
@@ -42,6 +42,7 @@ src_unpack() {
 		src/glew/glew.cpp \
 		src/glew/GL/glxew.h \
 		|| die "sed failed"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {