Fix compilation with gcc-4.3

Package-Manager: portage-2.1.4.4

4 files changed, 77 insertions, 5 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index fe99f0469a1c..903248a3ee22 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.33 2008/09/08 17:18:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.34 2008/09/19 04:51:22 tupone Exp $
+
+  19 Sep 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/flightgear-0.9.10-gcc43.patch, flightgear-0.9.10.ebuild:
+  Fix compilation with gcc-4.3
 
   08 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/flightgear-1.0.0-sdl.patch, flightgear-1.0.0.ebuild:
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index bc625b390f0b..e6ff083c561c 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX flightgear-0.9.10-gcc43.patch 1431 RMD160 68bdf5481d2d5323c71e169e08f1d828fdfe0608 SHA1 f93a882a6ddfd3ddeefce160047b92f5d2b5022d SHA256 ca908c294f15e7d4834b2322d65ca9b61e4df8c61c3e0a5b4355b97e81293664
 AUX flightgear-1.0.0-sdl.patch 388 RMD160 6d76ab59d7db019af897bcf702d75b2c631872d1 SHA1 7ba2f6a027474cebfa208c1bb777f0fa609e6499 SHA256 30b75c4cd89bb443ff6c6f8415dea096ba32245840772a8e0f2c554845815b50
 DIST FlightGear-0.9.10.tar.gz 2072135 RMD160 ebf268c350912b03f215088e108a29d0128bb347 SHA1 29911b9c17cece50a9e7d501f2259c89c0fa44ba SHA256 6307ad26e4141d27dcd66962f9c8e117206197a468b4f8bc99a6a31deb2e4992
 DIST FlightGear-1.0.0.tar.gz 2123216 RMD160 78a9c145f82bde79ac070e65d215e5d6ea555be9 SHA1 27de60d87316160eb9eb70bb82cd7ee2ed0407df SHA256 7add44fe5742d9712cc3543e2de066eac55f435b49b266f623bf53762520813d
 DIST fgfs-base-0.9.10.tar.bz2 146866758 RMD160 33fd5fe53d5b8091ec85526f3047b89bb43f8621 SHA1 4fc61a0791613e95f23c733cf32f7ac107478dfc SHA256 7770a7bd9f2bfa6475e414f4a83438c6e1e29abf12bd1b30045e3cc1732698eb
 DIST fgfs-base-1.0.0.tar.bz2 191345428 RMD160 49f345823f8f1b236fc3561a699e28a8d35cfb7d SHA1 f971719171cbea9a7d92a93b5f30b75ea194ac51 SHA256 52b20cbe61a47e5a51fdd0d492a326c19b0d323ec0c7304609acba53f1c787eb
-EBUILD flightgear-0.9.10.ebuild 1161 RMD160 1c02e5f2e2996325d1f284ba0288dad219639242 SHA1 5a30e68a957021c3920657d25612559d0c46bf2a SHA256 23404b957dce6e405911e2fa23770288489c347ba31cdb24eaea46af50d1a1a0
+EBUILD flightgear-0.9.10.ebuild 1242 RMD160 ceb423a6a9283e24531af1979f415ca215b11a5d SHA1 58bd2f932c30577040a6eddc0a27d956ecd1240c SHA256 56270616a3a061e0ca8ec641fcc6940c8b1762eade99aa377164e34eaf745251
 EBUILD flightgear-1.0.0.ebuild 1266 RMD160 34b7ae9990e702e2a7fea5a01f0b6f48b34056e5 SHA1 49c304f428f5b3422fe0bc4a13d85d418cac4de9 SHA256 91bc91ad29ed9d0136dc1a7c31bea5be918617fd4a691e45ebcc1038b5688d8e
-MISC ChangeLog 6312 RMD160 d18f92aaa3a1b548719baa5bcd215cdf7ce4f110 SHA1 3ac445cca1ebf43240e2056b0ebca4ff8a018696 SHA256 b24f16fb0971271a637e2dfbc69a66f46906e7b7c6868fb5b27845378e0a251c
+MISC ChangeLog 6457 RMD160 0bcf0c1fb1fc56c92d73cbf509f94422fd23fedb SHA1 4d44c641877a12698f060918aea94a2e92f4aa51 SHA256 5b8295c256d5feab982ac5351689933858b193f08ad335e724e185dbd42cf8ae
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjTL+AACgkQFByi98F1FAi6yQCgnGio49BAJhYNJBB7Hp+dQcui
+mU8AoIIVZig+cVHQYtu1NhkXwds6951/
+=rOMZ
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/flightgear/files/flightgear-0.9.10-gcc43.patch b/games-simulation/flightgear/files/flightgear-0.9.10-gcc43.patch
new file mode 100644
index 000000000000..f4700e8a67c6
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-0.9.10-gcc43.patch
@@ -0,0 +1,51 @@
+--- src/Airports/runways.cxx.old	2008-09-19 06:00:35.000000000 +0200
++++ src/Airports/runways.cxx	2008-09-19 06:01:16.000000000 +0200
+@@ -27,6 +27,7 @@
+ 
+ #include <math.h>               // fabs()
+ #include <stdio.h>              // sprintf()
++#include <stdlib.h>
+ 
+ #include <simgear/compiler.h>
+ 
+--- src/Airports/runwayprefs.cxx.old	2008-09-19 06:02:50.000000000 +0200
++++ src/Airports/runwayprefs.cxx	2008-09-19 06:04:05.000000000 +0200
+@@ -27,6 +27,8 @@
+ 
+ #include <math.h>
+ //#include <algorithm>
++#include <string.h>
++#include <stdlib.h>
+ 
+ #include <simgear/compiler.h>
+ 
+--- src/Airports/parking.cxx.old	2008-09-19 06:05:09.000000000 +0200
++++ src/Airports/parking.cxx	2008-09-19 06:05:32.000000000 +0200
+@@ -27,6 +27,7 @@
+ #endif
+ 
+ //#include <algorithm>
++#include <stdlib.h>
+ 
+ #include <simgear/compiler.h>
+ 
+--- src/FDM/JSBSim/input_output/FGfdmSocket.cpp.old	2008-09-19 06:13:29.000000000 +0200
++++ src/FDM/JSBSim/input_output/FGfdmSocket.cpp	2008-09-19 06:14:08.000000000 +0200
+@@ -37,6 +37,7 @@
+ INCLUDES
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+ 
++#include <string.h>
+ #include "FGfdmSocket.h"
+ 
+ namespace JSBSim {
+--- src/Main/util.cxx.old	2008-09-19 06:24:04.000000000 +0200
++++ src/Main/util.cxx	2008-09-19 06:24:38.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <simgear/compiler.h>
+ 
+ #include <math.h>
++#include <stdlib.h>
+ 
+ #include <vector>
+ SG_USING_STD(vector);
diff --git a/games-simulation/flightgear/flightgear-0.9.10.ebuild b/games-simulation/flightgear/flightgear-0.9.10.ebuild
index 0e056edfb6ba..16ae8d27e1d6 100644
--- a/games-simulation/flightgear/flightgear-0.9.10.ebuild
+++ b/games-simulation/flightgear/flightgear-0.9.10.ebuild
@@ -1,6 +1,6 @@
-# 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/games-simulation/flightgear/flightgear-0.9.10.ebuild,v 1.7 2007/05/27 18:33:11 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.10.ebuild,v 1.8 2008/09/19 04:51:22 tupone Exp $
 
 inherit eutils games
 
@@ -24,6 +24,12 @@ DEPEND="virtual/glut
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \