summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2006-05-23 21:48:57 +0000
committerAlfredo Tupone <tupone@gentoo.org>2006-05-23 21:48:57 +0000
commitb30dd6e702ccee934173987e6d6377b32756db8b (patch)
tree6d87c78b18a66f1c30cabb6c649a23d44dafeadc /games-sports
parentSpring cleanup. (diff)
downloadgentoo-2-b30dd6e702ccee934173987e6d6377b32756db8b.tar.gz
gentoo-2-b30dd6e702ccee934173987e6d6377b32756db8b.tar.bz2
gentoo-2-b30dd6e702ccee934173987e6d6377b32756db8b.zip
Fix for gcc-4.1, bug #132097
(Portage version: 2.1_rc2-r1)
Diffstat (limited to 'games-sports')
-rw-r--r--games-sports/trigger/ChangeLog6
-rw-r--r--games-sports/trigger/files/trigger-0.5.2-gcc41.patch11
-rw-r--r--games-sports/trigger/trigger-0.5.2-r1.ebuild5
-rw-r--r--games-sports/trigger/trigger-0.5.2.ebuild3
4 files changed, 21 insertions, 4 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/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() {