Fix build with gcc-4.4.0 Bug #269866

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 20 insertions, 4 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index 3596736b6a94..f87386ebf154 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.38 2009/03/20 14:56:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.39 2009/05/22 07:02:27 tupone Exp $
+
+  22 May 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/flightgear-1.9.1-gcc44.patch, flightgear-1.9.1.ebuild:
+  Fix build with gcc-4.4.0 Bug #269866 by Oschtan
 
   20 Mar 2009; Joseph Jezak <josejx@gentoo.org> flightgear-1.9.1.ebuild:
   Marked ~ppc for bug #252202.
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 9457e76e435d..1d9dd1b3f13a 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,5 +1,6 @@
 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
+AUX flightgear-1.9.1-gcc44.patch 268 RMD160 35785208026c9efb432ad03bee5cf2113a96befa SHA1 2283d4b702566e50f5660ed03c8cb1eeac09cae8 SHA256 af4f9eb165175b761ebba3734f39c201b8968a3c79998a215e749a432fcd0467
 AUX flightgear-1.9.1-parallel.patch 390 RMD160 166605f0e28479c4f40bd9ec042c12031903b6c2 SHA1 0d4a70faa9b80a620b6c49295d288ad861b48cfe SHA256 f37ee6216f36a247207ca48ebd99e96e0065eff6ff14ad00afea6eef2908287f
 AUX flightgear-1.9.1-sdl.patch 388 RMD160 6d76ab59d7db019af897bcf702d75b2c631872d1 SHA1 7ba2f6a027474cebfa208c1bb777f0fa609e6499 SHA256 30b75c4cd89bb443ff6c6f8415dea096ba32245840772a8e0f2c554845815b50
 DIST FlightGear-0.9.10.tar.gz 2072135 RMD160 ebf268c350912b03f215088e108a29d0128bb347 SHA1 29911b9c17cece50a9e7d501f2259c89c0fa44ba SHA256 6307ad26e4141d27dcd66962f9c8e117206197a468b4f8bc99a6a31deb2e4992
@@ -10,6 +11,6 @@ DIST fgfs-base-0.9.10.tar.bz2 146866758 RMD160 33fd5fe53d5b8091ec85526f3047b89bb
 DIST fgfs-base-1.0.0.tar.bz2 191345428 RMD160 49f345823f8f1b236fc3561a699e28a8d35cfb7d SHA1 f971719171cbea9a7d92a93b5f30b75ea194ac51 SHA256 52b20cbe61a47e5a51fdd0d492a326c19b0d323ec0c7304609acba53f1c787eb
 EBUILD flightgear-0.9.10.ebuild 1242 RMD160 ceb423a6a9283e24531af1979f415ca215b11a5d SHA1 58bd2f932c30577040a6eddc0a27d956ecd1240c SHA256 56270616a3a061e0ca8ec641fcc6940c8b1762eade99aa377164e34eaf745251
 EBUILD flightgear-1.0.0.ebuild 1261 RMD160 56b01f4810e286cf452a126052d3d0d0a877894b SHA1 b313071e27d6f5b5e94acb74d3a2b49d59241afd SHA256 af2d665160794c35f9dcc84dea38490cc76a21e53bbe7f061101f4d83111096a
-EBUILD flightgear-1.9.1.ebuild 1269 RMD160 a58c92d689f06e47089de4fb5280eca1f39f6747 SHA1 e3cd8a83e4e75b32ce19e03c748065f867744371 SHA256 1a2633d06df41773b4a25895a06292c898987aafe329b59aa9c5423c67cd183f
-MISC ChangeLog 7022 RMD160 5540421560736c44be9b63de9e098491f93d3e79 SHA1 ee6e3799b3ef42b4b1db04027089ffa8f25802c0 SHA256 7971ff5301823d08c3eba9868d39aab07b2bbbb5d3f91821d1c5b6c2ac0126a2
+EBUILD flightgear-1.9.1.ebuild 1304 RMD160 5a29856ce6f08a8340c06456e5b25e09dbfdca0b SHA1 692b9a19bc875ccbb8ee5e46257bf9d6934870e3 SHA256 13ab75cd9ad5d64cafde65567f5299f12677893cb84b2345d0c1d02ddd251d6c
+MISC ChangeLog 7187 RMD160 c44fd5833c41ba380f2b15d9aa908601a780d047 SHA1 485d484e4975338bcae75e3c1451055624facbcd SHA256 09040d4b7cb801dd0179ae6a5cb7b6393a54132655cadf474f471ec855a8bb83
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-simulation/flightgear/files/flightgear-1.9.1-gcc44.patch b/games-simulation/flightgear/files/flightgear-1.9.1-gcc44.patch
new file mode 100644
index 000000000000..778ffe506d99
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-1.9.1-gcc44.patch
@@ -0,0 +1,10 @@
+--- utils/GPSsmooth/UGear_command.cxx.old	2009-05-22 08:46:02.000000000 +0200
++++ utils/GPSsmooth/UGear_command.cxx	2009-05-22 08:46:58.000000000 +0200
+@@ -1,6 +1,7 @@
+ #include <cstring>
+ 
+ #include "UGear_command.hxx"
++#include <cstdio>
+ 
+ 
+ UGCommand::UGCommand():
diff --git a/games-simulation/flightgear/flightgear-1.9.1.ebuild b/games-simulation/flightgear/flightgear-1.9.1.ebuild
index 51c8e7f8ac2a..7996d0ce3e2a 100644
--- a/games-simulation/flightgear/flightgear-1.9.1.ebuild
+++ b/games-simulation/flightgear/flightgear-1.9.1.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-simulation/flightgear/flightgear-1.9.1.ebuild,v 1.2 2009/03/20 14:56:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-1.9.1.ebuild,v 1.3 2009/05/22 07:02:27 tupone Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -27,6 +27,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-sdl.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-parallel.patch
 	eautoreconf
 }