add back gcc43 patch (rerolled by Arttu Valo in bug #259406)

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 113 insertions, 5 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 32768a87e770..e6de66e533e3 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.59 2009/02/16 03:19:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.60 2009/02/20 17:48:06 mr_bones_ Exp $
+
+  20 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scorched3d-42-gcc43.patch, scorched3d-42.ebuild:
+  add back gcc43 patch (rerolled by Arttu Valo in bug #259406)
 
 *scorched3d-42 (16 Feb 2009)
 
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 5e10bfd55f3f..12f205ee9e52 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,8 +1,9 @@
 AUX scorched3d-41.3-gcc43.patch 1822 RMD160 1ec0e6808f78e3431fd2c7634774943a55a7b4d0 SHA1 42a92eae55440f7da3c2c60278686515ab217fcd SHA256 7430531c43b80f9cd4331c245297e1428efd0623347a0050bb4d8ef61156f87d
 AUX scorched3d-42-fixups.patch 1968 RMD160 a6bea8219e80fa693d2e820ed0a92d5da8ba56ce SHA1 df77a0e0806cb9d0a8348bb5e87a2ff855f1471e SHA256 d48d6677c228b991d2bb4e611d6259d62a7a63d96c77e67499b4f23122b652cd
+AUX scorched3d-42-gcc43.patch 3969 RMD160 6125222e3f556f03cf04f8837d26bf3935c0901f SHA1 91e399cf8881a0ce264d4cf5656684138c14245f SHA256 a8985f7a10569908ffa0e268c988a51e9f56eea9cbb842211f06d20d4ceec504
 DIST Scorched3D-41.3-src.tar.gz 60672892 RMD160 517689d2fd8c9d03a975e8fdc396c235de08c144 SHA1 c38fa05ca801b484c859012086dbbc03244ae71c SHA256 a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
 DIST Scorched3D-42-src.tar 166389760 RMD160 8e0a5add29adf604a431e28119f44b0fd5a56611 SHA1 30e245fc0fbd52026ee5885c82488f5126edd6a9 SHA256 b9576223396b15e3cf55d005cd48dcfa32f7481f85d7ef8d16ac070c38bdc233
 EBUILD scorched3d-41.3-r1.ebuild 1808 RMD160 2c5cda4b5587393e3b71a6f6aa99da9b38c5967f SHA1 1beb80ad2df2f2b389e6bf68f72b248b5a714657 SHA256 a7ea93c29fdfb63688c2725499f429ecfac6b87c4ddd8540dc7813f4c8c683cf
-EBUILD scorched3d-42.ebuild 1540 RMD160 2dd00624a2e07029edf65bcbd3363bbbbc5c73a7 SHA1 a8f6a1fcf97fa0b828a3fc5474be96e3903a0e8d SHA256 52f5cdc8443537987391690c437953e1f6a1e15e933ab71ca96352285eb1cb1b
-MISC ChangeLog 8013 RMD160 b2d1be400d0d59b549265f70043f2bdcdeeacd99 SHA1 e8d44bedf4f45d149aa39ce7802342047a98db3e SHA256 0a6c8f5ee1e785960f560f6e5831aed29ebc6ee6be402649b3e22a9262714099
+EBUILD scorched3d-42.ebuild 1579 RMD160 7cb24e787211a194bc71a2118494d896af4d049b SHA1 7ec09eb7f37380890e782d722e1c2f9f08ddbbdb SHA256 c78b960dc38171e9e3138c148f0d7ad90f944c7dde92ca2436e388d5131eb51b
+MISC ChangeLog 8190 RMD160 d56132e2c4aaeb7c14ccd7d5be100105ef54c834 SHA1 dd0243f97aec1d1cfe4dbf7683ada7cae83ce96f SHA256 36f1be79c3fa5b3abdc9e61597669806ecbc36ce5d7d6d8ecd862d1117987543
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/scorched3d/files/scorched3d-42-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-42-gcc43.patch
new file mode 100644
index 000000000000..6497e3cf5419
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-42-gcc43.patch
@@ -0,0 +1,101 @@
+diff -ur scorched.old/src/client/console/ConsoleImpl.cpp scorched/src/client/console/ConsoleImpl.cpp
+--- scorched.old/src/client/console/ConsoleImpl.cpp	2009-02-18 20:06:23.000000000 +0200
++++ scorched/src/client/console/ConsoleImpl.cpp	2009-02-18 20:39:23.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <GLEXT/GLViewPort.h>

+ #include <GLW/GLWFont.h>

+ #include <GLW/GLWToolTip.h>

++#include <climits>

+ 

+ ConsoleImpl::ConsoleImpl() : 

+ 	GameStateI("Console"),

+diff -ur scorched.old/src/common/common/DefinesFile.cpp scorched/src/common/common/DefinesFile.cpp
+--- scorched.old/src/common/common/DefinesFile.cpp	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/DefinesFile.cpp	2009-02-18 20:07:58.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <common/DefinesFile.h>

+ #include <sys/types.h>

+ #include <sys/stat.h>

++#include <cstring>

+ 

+ #pragma warning(disable : 4996)

+ 

+diff -ur scorched.old/src/common/common/LoggerI.cpp scorched/src/common/common/LoggerI.cpp
+--- scorched.old/src/common/common/LoggerI.cpp	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/LoggerI.cpp	2009-02-18 20:14:55.000000000 +0200
+@@ -20,6 +20,7 @@
+ 

+ #include <common/LoggerI.h>

+ #include <time.h>

++#include <cstring>

+ 

+ LoggerInfo::LoggerInfo(

+ 	const std::string &message, 

+diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
+--- scorched.old/src/common/common/main.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/main.h	2009-02-18 20:07:18.000000000 +0200
+@@ -40,7 +40,7 @@
+ void _no_storage()

+ {

+ 	printf("Failed to allocate memory!!");

+-	std::exit(1);

++	exit(1);

+ }

+ 

+ void run_main(int argc, char *argv[], OptionsParameters &params)

+diff -ur scorched.old/src/common/common/sha2.h scorched/src/common/common/sha2.h
+--- scorched.old/src/common/common/sha2.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/sha2.h	2009-02-18 20:24:57.000000000 +0200
+@@ -46,6 +46,7 @@
+ 

+ #include <string>

+ #include <stdexcept>

++#include <cstring>

+ 

+ // NOTE: You may need to define things by hand for your system: 

+ typedef unsigned char  sha_byte;           // Exactly 1 byte 

+diff -ur scorched.old/src/common/landscapemap/HeightMapModifier.cpp scorched/src/common/landscapemap/HeightMapModifier.cpp
+--- scorched.old/src/common/landscapemap/HeightMapModifier.cpp	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/landscapemap/HeightMapModifier.cpp	2009-02-18 20:28:50.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <image/ImageBitmap.h>

+ #include <image/ImageFactory.h>

+ #include <lang/LangResource.h>

++#include <climits>

+ 

+ void HeightMapModifier::levelSurround(HeightMap &hmap)

+ {

+diff -ur scorched.old/src/common/lang/LangParam.cpp scorched/src/common/lang/LangParam.cpp
+--- scorched.old/src/common/lang/LangParam.cpp	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/lang/LangParam.cpp	2009-02-18 20:22:06.000000000 +0200
+@@ -20,6 +20,7 @@
+ 

+ #include <lang/LangParam.h>

+ #include <common/DefinesString.h>

++#include <cstdlib>

+ 

+ LangParam::LangParam(const LangStringConverter &convValue)

+ {

+diff -ur scorched.old/src/common/lang/ResourceBundle.h scorched/src/common/lang/ResourceBundle.h
+--- scorched.old/src/common/lang/ResourceBundle.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/lang/ResourceBundle.h	2009-02-18 20:20:12.000000000 +0200
+@@ -23,6 +23,7 @@
+ 

+ #include <set>

+ #include <lang/ResourceBundleEntry.h>

++#include <cstring>

+ 

+ class ResourceBundle

+ {

+diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
+--- scorched.old/src/common/porting/windows.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/porting/windows.h	2009-02-18 20:06:46.000000000 +0200
+@@ -20,7 +20,7 @@
+ typedef unsigned short  WORD;

+ typedef unsigned char   BYTE;

+ 

+-typedef int 	HWND;

++// typedef int 	HWND;

+ typedef void * 	HINSTANCE;

+ typedef int 	WPARAM;

+ typedef int 	LPARAM;

diff --git a/games-strategy/scorched3d/scorched3d-42.ebuild b/games-strategy/scorched3d/scorched3d-42.ebuild
index ed6b5c89a71d..e876f10de3f4 100644
--- a/games-strategy/scorched3d/scorched3d-42.ebuild
+++ b/games-strategy/scorched3d/scorched3d-42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.ebuild,v 1.1 2009/02/16 03:19:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.ebuild,v 1.2 2009/02/20 17:48:06 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils wxwidgets games
@@ -35,7 +35,9 @@ DEPEND="media-libs/libsdl
 S=${WORKDIR}/scorched
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fixups.patch
+	epatch \
+		"${FILESDIR}"/${P}-fixups.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }