diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-10-20 06:51:13 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-10-20 06:51:13 +0000 |
| commit | 2aa993c8ae3e5d5394ffbf44cd92062e4c03be9c (patch) | |
| tree | 6933e4fb68bc78dced1dc51371ddae3784ad52d5 /games-strategy | |
| parent | Version Bump, removed old (diff) | |
| download | historical-2aa993c8ae3e5d5394ffbf44cd92062e4c03be9c.tar.gz historical-2aa993c8ae3e5d5394ffbf44cd92062e4c03be9c.tar.bz2 historical-2aa993c8ae3e5d5394ffbf44cd92062e4c03be9c.zip | |
add patch for building with gcc45 and USE=mysql with patch from Ryan Hill (bug #339745)
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/scorched3d/ChangeLog | 7 | ||||
| -rw-r--r-- | games-strategy/scorched3d/Manifest | 3 | ||||
| -rw-r--r-- | games-strategy/scorched3d/files/scorched3d-43.1c-gcc45.patch | 14 |
3 files changed, 22 insertions, 2 deletions
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog index 5df4c43bf983..68d62f251c51 100644 --- a/games-strategy/scorched3d/ChangeLog +++ b/games-strategy/scorched3d/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-strategy/scorched3d # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.74 2010/10/15 12:52:02 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.75 2010/10/20 06:51:13 mr_bones_ Exp $ + + 20 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org> + +files/scorched3d-43.1c-gcc45.patch: + add patch for building with gcc45 and USE=mysql with patch from Ryan Hill + (bug #339745) 15 Oct 2010; Brent Baude <ranger@gentoo.org> scorched3d-43.1c.ebuild: stable ppc, bug 322649 diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest index 334cdc444dbf..fc82dfcee350 100644 --- a/games-strategy/scorched3d/Manifest +++ b/games-strategy/scorched3d/Manifest @@ -5,6 +5,7 @@ AUX scorched3d-42.1-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f24 AUX scorched3d-42.1-win32.patch 625 RMD160 6170762627bb1094479eece1e07591e6e9703abf SHA1 9622d3d756999780da4385bd48a2cd12290d7aab SHA256 50c8cadae0476071f580983f8287e95ac15c45e865e4837b567493a97fcd4c5f AUX scorched3d-43.1c-fixups.patch 1967 RMD160 d06d0c20c5e65907a680ba39ebbbc57ee14a25cb SHA1 d13d821bca8c342bf04d5de0f5925649890c18c4 SHA256 7487d6708bfe250925cd7b425e200e5f566920c4fbb0376e3a5922bd60828934 AUX scorched3d-43.1c-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c3561 SHA1 6be351b7b56206d8540c0938e06759cc6ee0c0e2 SHA256 f139415a4deca70dc0ad087ce6714359d4076df89228e7ea1e61aa100e0558c8 +AUX scorched3d-43.1c-gcc45.patch 595 RMD160 a3ab9d5b2c74fe65c4404ac17ad9ed89bf48fe99 SHA1 fde4ca57aecebf2e83bc59c9a3241f2979c0f46e SHA256 5df5c35b7d25c172fb2021b0beca11eb059dfe9a91375d79be5154701211277c AUX scorched3d-43.1c-libpng14.patch 1381 RMD160 3f167ed7f5438f86cd338247e445fcb52e86542e SHA1 00bf971ef71f082cff58462b8d0a71a533f9068a SHA256 7b259663f640c19189cc5b845bb4cf27389cc56cb1c9f55300e14ff3738e1846 AUX scorched3d-43.1c-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f243e SHA1 71b0f9308e743dd1630977467c12b3caf89bb446 SHA256 27e8af602e38579f87b83bc67afc7c3fde012e058f73dab7b5e63f22752bb1be AUX scorched3d-43.1c-win32.patch 625 RMD160 6170762627bb1094479eece1e07591e6e9703abf SHA1 9622d3d756999780da4385bd48a2cd12290d7aab SHA256 50c8cadae0476071f580983f8287e95ac15c45e865e4837b567493a97fcd4c5f @@ -12,5 +13,5 @@ DIST Scorched3D-42.1-src.tar.gz 64491145 RMD160 ed8a621875d19eb4d7314293439f4c2a DIST Scorched3D-43.1c-src.tar.gz 64826904 RMD160 bc811571d983b3cdf9c5adb97b54b85f409073fe SHA1 5ba8dd0af0f167c08d24206e534c5574b0eb2c4a SHA256 ad5ce91e404f5a0286482feeca4aa5b175fb51a9d1f15a26bd3779b2059285bb EBUILD scorched3d-42.1.ebuild 1523 RMD160 dfd44428061a03bea6ce65443d8b09917d572fc8 SHA1 dbaec2007aa3f673ee9f407697ce46b10070dd48 SHA256 391ae1dd9998a3e24a8fd31cc40463099ae27d570cf3c7b8609b968a49c944e8 EBUILD scorched3d-43.1c.ebuild 1527 RMD160 88039f6c3b91c909f3da5a5bd2f3cc87d6f08c10 SHA1 a0a7c54c6ed9c3dca7aee5e54354d54893a944fd SHA256 a1ed1e16f76506bbbfb505cd6b63169738e9c0181cc41c8dd69a48128c87d2f1 -MISC ChangeLog 11456 RMD160 119046ed603e3cd5b4a40ef97056c883c23675ca SHA1 177336e35d0a6569be19fe6577ec4eaa7c69acdc SHA256 6b1b66b9371edce0c4cead8efc996fa9dbe7e8bddad0347185042f3fa0a00fe8 +MISC ChangeLog 11646 RMD160 789a2bc3d076c847d500d7df09882ad2595185aa SHA1 4ce118f88c0f3337bdc86b55cf8b6ef392b1600f SHA256 4aa49ddba1672e2b2ada20d8bf26e4f11d5404ae2a709fd1dbbc784cc33810b4 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-strategy/scorched3d/files/scorched3d-43.1c-gcc45.patch b/games-strategy/scorched3d/files/scorched3d-43.1c-gcc45.patch new file mode 100644 index 000000000000..9c2ba0993171 --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-43.1c-gcc45.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/339745 +http://www.scorched3d.co.uk/mantisbt/view.php?id=67 + +--- a/src/server/server/ServerAuthHandlerForumLogin.cpp ++++ b/src/server/server/ServerAuthHandlerForumLogin.cpp +@@ -252,7 +252,7 @@ bool ServerAuthHandlerForumLogin::connectHandler() + !file.getRootNode()->getNamedChild("passwd", passwd) ||
+ !file.getRootNode()->getNamedChild("db", db))
+ {
+- Logger::log(S3D::formatStringBuffer("Failed to parse %s settings file.", fileName));
++ Logger::log(S3D::formatStringBuffer("Failed to parse %s settings file.", fileName.c_str()));
+ return false;
+ }
+
|