Fix compilation with gcc-4.3

Package-Manager: portage-2.1.4.4

4 files changed, 93 insertions, 8 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index 3883d338a5d9..d5f1de82bf7e 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/simgear
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.32 2008/09/07 13:20:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.33 2008/09/19 03:45:21 tupone Exp $
+
+  19 Sep 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/simgear-0.3.10-gcc43.patch, simgear-0.3.10.ebuild:
+  Fix compilation with gcc-4.3
 
   07 Sep 2008; Markus Meier <maekke@gentoo.org> simgear-1.0.0.ebuild:
   x86 stable, bug #217505
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 87dab2e0d041..c7c13de6c580 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX simgear-0.3.10-gcc43.patch 2015 RMD160 0f2bc87fdfd7c59926494f5983533d9c06658b85 SHA1 25dbb3da6b3f8fb69cc895b32d579146ff840d4c SHA256 342f17f73995bb52a0810bc47737bb3dd61b25c6e7c4bb89cfcb474419eaa8ee
 DIST SimGear-0.3.10.tar.gz 752225 RMD160 11bfb77efab7562f14c9bc0688f99af9a45f4c81 SHA1 83e8435b52463fdb2736ccb2f0e42b572528131f SHA256 fc14e986d11212a5435d684c4f7cd4245e5afa942db5a8e48b82cbd57ac84720
 DIST SimGear-1.0.0.tar.gz 769214 RMD160 62f260d55d621221076fafb703593f6c4e3c9d53 SHA1 cad6cc8a205005731633d8dec994cfa299f90e8a SHA256 574e1d41a3a310f7904549af62dd0d7029d841c1eb78dcd2fc5649401b378a5d
-EBUILD simgear-0.3.10.ebuild 729 RMD160 9d5e5af8cd31fbba29b4ce3803481a2c7537276b SHA1 550a19b85499df9d7dc92eda5c6b3bc5748089de SHA256 9245ac3d0487bc24fa83a55d0b4bc1042b4e9086e73862b54909a49d7c74ba4b
+EBUILD simgear-0.3.10.ebuild 826 RMD160 8bfb48f100c5a3de2d189ba44540f9a56c5ca662 SHA1 c742e3feb6573fa94a506ae7b4c98bd501b1d810 SHA256 697d31e8e0a34cf1162e45836fc8d77a3ffc77b4a0650aa0ab28c758c9a894c4
 EBUILD simgear-1.0.0.ebuild 712 RMD160 08d4f255c47f556b2bff55a20dcd20c5d56c078f SHA1 2c398bd82b6b929967b1ed9b932d4e9a98b28ff9 SHA256 601c61bd3e213a9db0f704791ac1694cd49adfb3b63a538708b7c4d480617676
-MISC ChangeLog 5716 RMD160 5aa656869a78afd4c69ea7d9c88846d69e6e71a1 SHA1 3c4b590f924ea693aecb4497912270458afa25ff SHA256 9731dfb0d0654b2fd375bed25ea9480c6ccbc43f7b882eff6a791dcb2d7adf1f
+MISC ChangeLog 5858 RMD160 de579d11d3b8e13dc910de4d2246ff5c50997826 SHA1 2ce24967607d3ef6784c2833b59d208a3df11686 SHA256 dfe5df3858441e0d792d72090ef88b2f7ea7a58ebedadf310e8aed906b3e349f
 MISC metadata.xml 538 RMD160 ad9da47ba8d1df3750dfedc20cb0d385d9118084 SHA1 b7e65e3f3441922661bc0f73de9e844e4acfe43b SHA256 0e2b83bd660e0709ada2f3e9b5d9db161e505ad9baf7c56dd6ee3299f5ce1963
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjD1UoACgkQkKaRLQcq0GJQLACdH9JO2mfl8XETZwN6bG2I8bEm
-v2EAn1ocuYxU05FeKBWMKXsVtudT7+Z3
-=YHEK
+iEYEARECAAYFAkjTIF0ACgkQFByi98F1FAgZXgCeLDeHI4xminE6lgls5IpWBXKI
+024AnjMtuj8lq8sdzuKynIs1LgKf/k9j
+=FXWh
 -----END PGP SIGNATURE-----
diff --git a/dev-games/simgear/files/simgear-0.3.10-gcc43.patch b/dev-games/simgear/files/simgear-0.3.10-gcc43.patch
new file mode 100644
index 000000000000..dcd1388111f1
--- /dev/null
+++ b/dev-games/simgear/files/simgear-0.3.10-gcc43.patch
@@ -0,0 +1,72 @@
+--- simgear/misc/strutils.cxx.old	2008-09-18 23:38:03.000000000 +0200
++++ simgear/misc/strutils.cxx	2008-09-18 23:38:50.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <ctype.h>
+ #include "strutils.hxx"
++#include <string.h>
+ 
+ namespace simgear {
+     namespace strutils {
+--- simgear/misc/tabbed_values.cxx.old	2008-09-18 23:43:06.000000000 +0200
++++ simgear/misc/tabbed_values.cxx	2008-09-18 23:43:36.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include "tabbed_values.hxx"
+ 
+ #include "assert.h"
++#include <stdlib.h>
+ 
+ SGTabbedValues::SGTabbedValues(const char *line) :
+ 	_line(line)
+--- simgear/io/sg_file.cxx.old	2008-09-18 23:45:26.000000000 +0200
++++ simgear/io/sg_file.cxx	2008-09-18 23:45:47.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ 
+ #include <simgear/compiler.h>
++#include <string.h>
+ 
+ #include STL_STRING
+ 
+--- simgear/io/sg_serial.cxx.old	2008-09-18 23:46:32.000000000 +0200
++++ simgear/io/sg_serial.cxx	2008-09-18 23:47:17.000000000 +0200
+@@ -29,6 +29,8 @@
+ #include <simgear/serial/serial.hxx>
+ 
+ #include "sg_serial.hxx"
++#include <string.h>
++#include <stdlib.h>
+ 
+ SG_USING_STD(string);
+ 
+--- simgear/screen/RenderTexture.cpp.old	2008-09-18 23:51:48.000000000 +0200
++++ simgear/screen/RenderTexture.cpp	2008-09-18 23:52:15.000000000 +0200
+@@ -64,6 +64,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <stdarg.h>
++#include <string.h>
+ 
+ #ifdef _WIN32
+ #pragma comment(lib, "gdi32.lib") // required for GetPixelFormat()
+--- simgear/screen/shader.cpp.old	2008-09-18 23:54:02.000000000 +0200
++++ simgear/screen/shader.cpp	2008-09-18 23:54:45.000000000 +0200
+@@ -26,6 +26,8 @@
+ #include "shader.h"
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <string.h>
++#include <stdlib.h>
+ 
+ 
+ glVertexAttrib1dProc glVertexAttrib1dPtr = NULL;
+--- simgear/screen/TestRenderTexture.cpp.old	2008-09-18 23:55:46.000000000 +0200
++++ simgear/screen/TestRenderTexture.cpp	2008-09-18 23:56:28.000000000 +0200
+@@ -16,6 +16,7 @@
+ 
+ #include <assert.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ void Reshape(int w, int h);
+ 
diff --git a/dev-games/simgear/simgear-0.3.10.ebuild b/dev-games/simgear/simgear-0.3.10.ebuild
index 5655e161044e..d4622b5fd274 100644
--- a/dev-games/simgear/simgear-0.3.10.ebuild
+++ b/dev-games/simgear/simgear-0.3.10.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.10.ebuild,v 1.7 2007/05/27 18:31:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.10.ebuild,v 1.8 2008/09/19 03:45:21 tupone Exp $
+
+inherit eutils
 
 MY_P="SimGear-${PV/_/-}"
 DESCRIPTION="Development library for simulation games"
@@ -18,6 +20,12 @@ DEPEND=">=media-libs/plib-1.8.4
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	econf || die
 	emake -j1 || die "emake failed"