summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-01-16 19:55:39 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-01-16 19:55:39 +0000
commitdc71b6a32645838ff0e4dd9b59c07ee45972fb7c (patch)
tree8fcf056c286a2eaba1e0d860b7cf43a72396a2f1 /dev-games
parentGrab upstream fixes for upstream bug 6604. (diff)
downloadgentoo-2-dc71b6a32645838ff0e4dd9b59c07ee45972fb7c.tar.gz
gentoo-2-dc71b6a32645838ff0e4dd9b59c07ee45972fb7c.tar.bz2
gentoo-2-dc71b6a32645838ff0e4dd9b59c07ee45972fb7c.zip
gcc-4.3 fix, bug #250791
(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686)
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/kyra/ChangeLog8
-rw-r--r--dev-games/kyra/files/kyra-2.0.7-gcc43.patch23
-rw-r--r--dev-games/kyra/kyra-2.0.7.ebuild5
3 files changed, 32 insertions, 4 deletions
diff --git a/dev-games/kyra/ChangeLog b/dev-games/kyra/ChangeLog
index f1a1475a78ee..229e32a187cd 100644
--- a/dev-games/kyra/ChangeLog
+++ b/dev-games/kyra/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/kyra
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.10 2006/10/26 21:37:27 nyhm Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.11 2009/01/16 19:55:39 tupone Exp $
+
+ 16 Jan 2009; Tupone Alfredo <tupone@gentoo.org>
+ +files/kyra-2.0.7-gcc43.patch, kyra-2.0.7.ebuild:
+ gcc-4.3 fix, bug #250791 by flameeyes@gentoo.org
26 Oct 2006; Tristan Heaven <nyhm@gentoo.org> +files/kyra-2.0.7-sdl.patch,
kyra-2.0.7.ebuild:
diff --git a/dev-games/kyra/files/kyra-2.0.7-gcc43.patch b/dev-games/kyra/files/kyra-2.0.7-gcc43.patch
new file mode 100644
index 000000000000..1798cee69ac7
--- /dev/null
+++ b/dev-games/kyra/files/kyra-2.0.7-gcc43.patch
@@ -0,0 +1,23 @@
+diff -Nurpa kyra.orig/tinyxml/tinyxml.cpp kyra/tinyxml/tinyxml.cpp
+--- kyra.orig/tinyxml/tinyxml.cpp 2008-12-18 08:48:49.000000000 +0300
++++ kyra/tinyxml/tinyxml.cpp 2008-12-18 08:50:16.000000000 +0300
+@@ -23,6 +23,8 @@ distribution.
+
+ #include "tinyxml.h"
+
++#include <cstdlib>
++#include <cstring>
+
+ TiXmlNode::TiXmlNode( NodeType _type )
+ {
+diff -Nurpa kyra.orig/tinyxml/tinyxmlparser.cpp kyra/tinyxml/tinyxmlparser.cpp
+--- kyra.orig/tinyxml/tinyxmlparser.cpp 2008-12-18 08:48:49.000000000 +0300
++++ kyra/tinyxml/tinyxmlparser.cpp 2008-12-18 08:51:03.000000000 +0300
+@@ -24,6 +24,7 @@ distribution.
+
+ #include "tinyxml.h"
+ #include <ctype.h>
++#include <cstring>
+
+ const char* TiXmlBase::SkipWhiteSpace( const char* p )
+ {
diff --git a/dev-games/kyra/kyra-2.0.7.ebuild b/dev-games/kyra/kyra-2.0.7.ebuild
index 3c992c711a51..ad899a3038a7 100644
--- a/dev-games/kyra/kyra-2.0.7.ebuild
+++ b/dev-games/kyra/kyra-2.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.0.7.ebuild,v 1.12 2006/10/26 21:37:27 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.0.7.ebuild,v 1.13 2009/01/16 19:55:39 tupone Exp $
inherit eutils
@@ -24,6 +24,7 @@ src_unpack() {
cd "${S}"
epatch \
"${FILESDIR}/${P}"-gcc41.patch \
+ "${FILESDIR}/${P}"-gcc43.patch \
"${FILESDIR}"/${P}-sdl.patch
}