Patch to fix building with gcc-4.3 from Peter Alfredsen, bug #219502

Package-Manager: portage-2.1.5_rc6

4 files changed, 69 insertions, 8 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 99d07613b76a..b8612607d33c 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.51 2008/03/18 01:05:59 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.52 2008/04/30 15:13:33 nyhm Exp $
+
+  30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/scorched3d-41.3-gcc43.patch, scorched3d-41.3-r1.ebuild:
+  Patch to fix building with gcc-4.3 from Peter Alfredsen, bug #219502
 
 *scorched3d-41.3-r1 (18 Mar 2008)
 
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 976aede8ad21..312a66102db2 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -5,19 +5,20 @@ AUX scorched3d-40-freealut.patch 1642 RMD160 f1b34457eb557593c9d41227353cd0d44d7
 AUX scorched3d-40-gcc4.patch 8484 RMD160 bdd202713b9ac4d57e08a3b2bf7ff60093c110a3 SHA1 8801919284a8d75f0160d3db90e25db2635295e7 SHA256 f88e7299096cfc7a465923da247ca1f51629ce4eed3a69d5d1d0b1018e4cc1f6
 AUX scorched3d-40-unicode.patch 1759 RMD160 89b0ce779ad07ad8dcb4252be3029e8251e94c0e SHA1 3cb5b91921633217be19adb1720419737a27bd56 SHA256 c84ef2cd1f60bba076ab44f8ee4417476dfd0969da0136b2c6a98727c6efbb3a
 AUX scorched3d-40.1d-freealut.patch 1441 RMD160 4b12f99f9dff61504b95168f74f16eb433fd0654 SHA1 16a50065e27f201fc1fae84bb799ea78335400ee SHA256 b67b346e25212a14c5142402ae620bc0afbfbab4fb132b417a4945272752678a
+AUX scorched3d-41.3-gcc43.patch 1822 RMD160 1ec0e6808f78e3431fd2c7634774943a55a7b4d0 SHA1 42a92eae55440f7da3c2c60278686515ab217fcd SHA256 7430531c43b80f9cd4331c245297e1428efd0623347a0050bb4d8ef61156f87d
 DIST Scorched3D-40-src.tar.gz 55427740 RMD160 2e900986a8a9262d3ffb85d1f6e6bfd4b4d9b9a6 SHA1 91a80b8a968532b505082d477c646b3a8e805ecd SHA256 8722d1f06e50f25f8e373f4388668a8b056e978dba8b86f197a45c3fa1f9008b
 DIST Scorched3D-40.1d-src.tar.gz 55701460 RMD160 0585295e1bc32b80329be7da2203b3dfc549f95f SHA1 14f0291534572273f74daa7e925c8e85a2971eb7 SHA256 76fc3eb70923551e978d3f35801d5731402c70c7c992063fafe403f0c6334252
 DIST Scorched3D-41.3-src.tar.gz 60672892 RMD160 517689d2fd8c9d03a975e8fdc396c235de08c144 SHA1 c38fa05ca801b484c859012086dbbc03244ae71c SHA256 a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
 EBUILD scorched3d-40.1d.ebuild 1351 RMD160 b85b2a7ca33abe89810f8871ca4daa98fdb6fa8e SHA1 d7adaa40d12f9620636221b7a34222daf0d6dc68 SHA256 4acede9f7946b3bae16e8b9622222eef450b4811afeedbb82239e486b704aed8
 EBUILD scorched3d-40.ebuild 1440 RMD160 e1720251b26a779193a7e28719584de02a30e9f3 SHA1 c57d3cf9290cfdb816399d3b9cef05501f806b10 SHA256 dd36f917ef54d9a1fc8f8ebc1154d31ef7299535da4ededf919103fde6acf423
-EBUILD scorched3d-41.3-r1.ebuild 1526 RMD160 331a8be9c363ae0d3868b5bdd680bdcdad60614f SHA1 f9ddb45aa67287e49ca1136d90e08a2b2e8c27e3 SHA256 9460bb3a81bb7fe4bd616e46884bfa7d40bc5331a30660e7e01074039d8e4a1f
+EBUILD scorched3d-41.3-r1.ebuild 1627 RMD160 6bb599fe93b7b1616ecf7ee65c337c89f2bb38a7 SHA1 c303280e631bd28ea703b61a3210f5926e3c3fb9 SHA256 f8a3b4434c3147bba1651b0f5fd8b9a5f086f7bec58bc51db94d7e60b6d26ea1
 EBUILD scorched3d-41.3.ebuild 1528 RMD160 adb417c1f564a4ef31ca3d4d5701be9406ad27ce SHA1 72f9115a854e67ecc215cf6c3711be968c4e84d9 SHA256 ea5a84199550f0908843f6eae8466b4bab8064e243492a8a6638715ca1d9a2e6
-MISC ChangeLog 6969 RMD160 d890ddb4e190ffd9697212446aa88c889c1077f9 SHA1 64d63cbbdac441bfa9b9d5687442e38fc6314a62 SHA256 9cbe8704f7d9235bc347d13c8fded956b0fc5ec17f96378de146747a72fc256b
+MISC ChangeLog 7154 RMD160 1939bcef338a7acd22ea4ca1b82ec8ec8ce2dda0 SHA1 3291c5a266c13bf5e9aa0bd73ce207baa8f2f919 SHA256 516ec93960fef65f7c606b200a62155902dd2501686970bcbd9ec04618fd374e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH3xV+dz7hIScOURERAuroAKDaiJNQYGGqnSrc7XmYBTG/ErgxhACeONm5
-tN5tEex6IcRachMhYcGENhM=
-=Xh11
+iEYEARECAAYFAkgYjKQACgkQdz7hIScOURF02gCffwnu6HLRR1IFqhlva2OSdmgC
++hUAoKfVQkJMR+IzmgSyENoBxUnKB+g3
+=D6WD
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/scorched3d/files/scorched3d-41.3-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-41.3-gcc43.patch
new file mode 100644
index 000000000000..85d7369951f3
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-41.3-gcc43.patch
@@ -0,0 +1,49 @@
+Index: scorched3d-41.3dfsg/src/common/main.h
+===================================================================
+--- scorched3d-41.3dfsg.orig/src/common/main.h	2008-01-26 20:41:37.000000000 +0100
++++ scorched3d-41.3dfsg/src/common/main.h	2008-01-26 20:45:15.000000000 +0100
+@@ -21,6 +21,8 @@
+ #define WIN32_LEAN_AND_MEAN
+ 
+ #include <windows.h>
++#include <cstdlib>
++#include <vector>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Index: scorched3d-41.3dfsg/src/common/sha2.h
+===================================================================
+--- scorched3d-41.3dfsg.orig/src/common/sha2.h	2008-01-26 20:41:37.000000000 +0100
++++ scorched3d-41.3dfsg/src/common/sha2.h	2008-01-26 20:45:15.000000000 +0100
+@@ -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 
+Index: scorched3d-41.3dfsg/src/common/DefinesFile.cpp
+===================================================================
+--- scorched3d-41.3dfsg.orig/src/common/DefinesFile.cpp	2008-01-26 20:41:37.000000000 +0100
++++ scorched3d-41.3dfsg/src/common/DefinesFile.cpp	2008-01-26 20:45:15.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string>
++#include <cstring>
+ #include <common/DefinesFile.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+Index: scorched3d-41.3dfsg/src/common/LoggerI.cpp
+===================================================================
+--- scorched3d-41.3dfsg.orig/src/common/LoggerI.cpp	2008-01-26 20:45:33.000000000 +0100
++++ scorched3d-41.3dfsg/src/common/LoggerI.cpp	2008-01-26 20:46:03.000000000 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <common/LoggerI.h>
+ #include <time.h>
++#include <cstring>
+ 
+ LoggerInfo::LoggerInfo(
+ 	const char *message, 
diff --git a/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild b/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild
index 2bbeab797880..fb8450b93b58 100644
--- a/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild,v 1.1 2008/03/18 01:05:59 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild,v 1.2 2008/04/30 15:13:33 nyhm Exp $
 
 inherit eutils wxwidgets games
 
@@ -39,6 +39,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
@@ -48,6 +54,7 @@ src_compile() {
 		--datadir="${GAMES_DATADIR}/${PN}" \
 		--with-docdir="/usr/share/doc/${PF}" \
 		--with-wx-config="${WX_CONFIG}" \
+		--without-pgsql \
 		$(use_with mysql) \
 		$(use_enable dedicated serveronly) \
 		|| die