diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-01-16 19:55:39 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-01-16 19:55:39 +0000 |
| commit | 842b5daf3a2462411fa039d3f56bb7a746db5691 (patch) | |
| tree | 00c18eeeb1a72893445b341a8cae4581cb25f689 | |
| parent | Grab upstream fixes for upstream bug 6604. (diff) | |
| download | historical-842b5daf3a2462411fa039d3f56bb7a746db5691.tar.gz historical-842b5daf3a2462411fa039d3f56bb7a746db5691.tar.bz2 historical-842b5daf3a2462411fa039d3f56bb7a746db5691.zip | |
gcc-4.3 fix, bug #250791
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686
| -rw-r--r-- | dev-games/kyra/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/kyra/Manifest | 15 | ||||
| -rw-r--r-- | dev-games/kyra/files/kyra-2.0.7-gcc43.patch | 23 | ||||
| -rw-r--r-- | dev-games/kyra/kyra-2.0.7.ebuild | 5 |
4 files changed, 45 insertions, 6 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/Manifest b/dev-games/kyra/Manifest index 5c1434d5c55f..10e986858cfc 100644 --- a/dev-games/kyra/Manifest +++ b/dev-games/kyra/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX kyra-2.0.7-gcc41.patch 1625 RMD160 427622ba0a08623ca6b59d497dc3cda65f746cce SHA1 4e7df5958c92e8100a618becb32f782c5e80efb1 SHA256 a6e6da8256d051632f1659e74ca3822ce2b457309e8fadcccb0b633eb51f4819 +AUX kyra-2.0.7-gcc43.patch 728 RMD160 777167a023dcc4ad57ddcdfc45b471144da94394 SHA1 59bbdb87bb72e65dc7c0437d006ea0b91d6d17c8 SHA256 0c2a196670940b8da1e87837eef1663ca67b96190fb33ee0957dea2444f30715 AUX kyra-2.0.7-sdl.patch 467 RMD160 b9735ca6ac0bfed805bb575ed2438849040e2c3a SHA1 73bc37d7f8bea10c0b30988b7a1a3b5fc7b0533c SHA256 c27531b9db4acaca978b0c474bf9ee88d0ea618ab6daa1b3b94b30c4781beca4 DIST kyra_src_2_0_7.tar.gz 1994743 RMD160 e9e78a67d452cdc5082da5e16113f4ccd910c70b SHA1 09e02a072aa3db874593e65c0255842df3e379c4 SHA256 63502490ed5e0a0c1c7fb68410412ab498eb3b26898ec7ebdd328845bba114c6 -EBUILD kyra-2.0.7.ebuild 865 RMD160 ee4bff3b125fa4692b91197fb87e5ceef3e921e0 SHA1 055b76c4d95f3c9a215eee9b340132f1d5d1103b SHA256 0e2fd988dd32308528d36cb3da01bc7026891ead8f2abf98d16bbc71ec90ca5f -MISC ChangeLog 1290 RMD160 674b7156c51b76d6d3297aeb5fb483d9db99eb32 SHA1 9fa8a300a65a7a15e9dbe43438e1bd122d525199 SHA256 9a9f1fc60f18f256921549cc3e00ba9bb8358e4beb5a28edac14cd6d8bbb95cf +EBUILD kyra-2.0.7.ebuild 902 RMD160 2932f8dd761ab5097a12e1fa10f787b004658e48 SHA1 ba0e9fb7418eb5cda580b010147cb5bea12c7801 SHA256 3ad3db4404837c39129811f19cdd9eab8de3643a44499dbbfb4cdd16fd051ed6 +MISC ChangeLog 1446 RMD160 0739473addac3abeb380f77f924d6633f188be8f SHA1 c944cd60e2927c5efce787775c53e1c4760f5c68 SHA256 c71afe018a918439b9444d9987ac09cc4773e4183df80765c139c676272441b5 MISC metadata.xml 2481 RMD160 09171f66958637e45994da3a50375877b59f9d62 SHA1 421d6b3e519d70201cf79da93d118f2e03061f0d SHA256 6e4d5c1d2524111ca002698be79bc8647a630602a0318ce3f66a8aa865194937 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAklw5kcACgkQSYz9rjec82a67ACgwLirkX/bZvIqma5u4R1tjUwM +wp0An1AMNK8hWXKQLCaeDTZ0kYL0eHHk +=egRq +-----END PGP SIGNATURE----- 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 } |