Fix compilation with gcc-4.3

(Portage version: 2.1.4.4)

3 files changed, 87 insertions, 3 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/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"