Fix build with gcc-4.4.0 Bug #269275

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

4 files changed, 55 insertions, 9 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index cdb8cc7b9d9b..91de512e082a 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/enigma
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.43 2009/01/12 06:19:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.44 2009/05/22 08:52:18 tupone Exp $
+
+  22 May 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/enigma-1.01-gcc44.patch, enigma-1.01.ebuild:
+  Fix build with gcc-4.4.0 Bug #269275
 
   12 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> enigma-1.01.ebuild:
   EAPI=2; add use-based dep for media-libs/sdl-image (bug #206393)
@@ -12,7 +16,7 @@
 
   18 Nov 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/enigma-1.01-xerces-c.patch, enigma-1.01.ebuild:
-  add patch for building with xerces-c-3 from Frédéric COIFFIER via bug #242916
+  add patch for building with xerces-c-3 from Frédéric COIFFIER via bug #242916
 
   18 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org> enigma-1.01.ebuild:
   new tarball from upstream for 64-bit support (bug #235076)
@@ -28,7 +32,7 @@
 
   30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
   +files/enigma-1.01-gcc43.patch, enigma-1.01.ebuild:
-  Patch to fix building with gcc-4.3 from Martin Väth, bug #218941
+  Patch to fix building with gcc-4.3 from Martin Väth, bug #218941
 
 *enigma-1.01 (04 Nov 2007)
 
@@ -176,16 +180,16 @@
 
 *enigma-0.40a (21 Jun 2002)
 
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> enigma-0.40a.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> enigma-0.40a.ebuild :
   Added KEYWORDS.
 
-  21 Jun 2002; J.Alberto Suárez L. <bass@gentoo.org> enigma-0.40a.ebuild:
+  21 Jun 2002; J.Alberto Suárez L. <bass@gentoo.org> enigma-0.40a.ebuild:
 
   Bumped version of Larry Cow,fixed problems with gcc3.
 
 *enigma-0.39a (28 Apr 2002)
 
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> enigma-0.39a.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> enigma-0.39a.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   28 Apr 2002; Ryan Phillips <rphillips@gentoo.org> enigma-0.39a.ebuild :
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 8556dacc6468..75502de40faf 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,7 +1,8 @@
 AUX enigma-1.01-autotools.patch 2865 RMD160 a8415815e2f73be9f89066e58e712ffc8cc784c8 SHA1 4b9dd11660428438a32d5a5cee8304e8a5045279 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1
 AUX enigma-1.01-gcc43.patch 813 RMD160 27998358a70579aabbd476358ce6e262494a2ce5 SHA1 fabc6422e5bf9372179d23bc2da3fe9e280172b7 SHA256 24f5f4f4b4235622d84bc5fd4c954aeffa7c3f2fccd1daa78ad458e44afca897
+AUX enigma-1.01-gcc44.patch 1210 RMD160 7bbdc69827e2e5f30589a3870d937db9a5ffe9e0 SHA1 2844bf4c7aaf44198af893f890b96fcdcd962107 SHA256 fc99f9b6b434405727974bf2a696a8b817148164882174ebcc5080134837f213
 AUX enigma-1.01-xerces-c.patch 3824 RMD160 f58690c41dbf2d47b25523de8bd7a86de5f6627c SHA1 f64878363fedf54f1f6e186555f789a25e13f9cd SHA256 9868afa6bbb4f430bc708f6c5ce2c7c9b434ea044e9ccf239d706d56071c710f
 DIST enigma-1.01-64bit.tar.gz 10891095 RMD160 671971415e8d96bc84e2a823d66359025e158128 SHA1 2f9f5aaf3d233c248d818c3a2fd5ea873d34135f SHA256 ae87ecf635bd89bec143a8011e30a4a3b546edb3fe2ed2fca243d366bb599736
-EBUILD enigma-1.01.ebuild 1166 RMD160 75fbd24e0fffb371f48bfe7da999b51bf826a8ab SHA1 11b1f5f2f3b391a004e70f31c3d254c3a01fe1e4 SHA256 0af9582dad21391cfc7b8c391bd444e158bc4a44576faecab574944cdf3b6dce
-MISC ChangeLog 6815 RMD160 6659e54423e0b832c01f6e0f2c6b6d4f4c3e9b43 SHA1 ae80dbdeeec51afe5a5782d04a8f1804a86f8709 SHA256 3bb3119fd76393b4655435c65b996481fb75698252aa69fd92c2841f79a7b49b
+EBUILD enigma-1.01.ebuild 1198 RMD160 03ca4a006cf3240af00fa9c4aac57ec635bfdb10 SHA1 3acc60c88dabd7d04b9dc5ca99850719dc9648f8 SHA256 b8329812b749928ed579f4d4aa0c581bc2a3e961825592b8e60e94eb5a30ca48
+MISC ChangeLog 6972 RMD160 f39664de1ba97da725b566dc2c3156f6b13a8247 SHA1 e3db6c7b0aecffa11f14f32bc5cb57d8072a4b38 SHA256 43b28c5442cc318e2fdb7e1586928deaae100e2f7a51ba8dc265cb45aa21778c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/enigma/enigma-1.01.ebuild b/games-puzzle/enigma/enigma-1.01.ebuild
index dc3e049f4b3c..75b4ca082141 100644
--- a/games-puzzle/enigma/enigma-1.01.ebuild
+++ b/games-puzzle/enigma/enigma-1.01.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-puzzle/enigma/enigma-1.01.ebuild,v 1.10 2009/01/12 06:19:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.01.ebuild,v 1.11 2009/05/22 08:52:18 tupone Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -30,6 +30,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-autotools.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-xerces-c.patch
 	eautoreconf
 }
diff --git a/games-puzzle/enigma/files/enigma-1.01-gcc44.patch b/games-puzzle/enigma/files/enigma-1.01-gcc44.patch
new file mode 100644
index 000000000000..4695ec4f2118
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.01-gcc44.patch
@@ -0,0 +1,40 @@
+--- src/PropertyManager.cc.old	2009-05-22 10:50:04.000000000 +0200
++++ src/PropertyManager.cc	2009-05-22 10:50:30.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "XMLtoLocal.hh"
+ #include "XMLtoUtf8.hh"
+ #include "ecl_system.hh"
++#include <cstdio>
+ #include <iostream>
+ #include <xercesc/dom/DOM.hpp>
+ #include <xercesc/util/XMLDouble.hpp>
+--- src/StateManager.cc.old	2009-05-22 10:52:13.000000000 +0200
++++ src/StateManager.cc	2009-05-22 10:52:38.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include "XMLtoUtf8.hh"
+ #include "ecl_system.hh"
+ #include "gui/ErrorMenu.hh"
++#include <cstdio>
+ #include <iostream>
+ #include <sstream>
+ #include <xercesc/dom/DOM.hpp>
+--- src/gui/LevelPackComposer.cc.old	2009-05-22 10:53:46.000000000 +0200
++++ src/gui/LevelPackComposer.cc	2009-05-22 10:54:24.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "lev/Index.hh"
+ 
+ #include "main.hh"
++#include <cstdio>
+ 
+ using namespace ecl;
+ using namespace std;
+--- src/lev/Index.cc.old	2009-05-22 10:55:16.000000000 +0200
++++ src/lev/Index.cc	2009-05-22 10:55:41.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "StateManager.hh"
+ #include "lev/ScoreManager.hh"
+ #include "lev/RatingManager.hh"
++#include <cstdio>
+ 
+ 
+ namespace enigma { namespace lev {