Patch to fix building with gcc-4.3 from Martin Väth, bug #218941

Package-Manager: portage-2.1.5_rc6

4 files changed, 64 insertions, 7 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index 147437a46982..1d735b623bf1 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/enigma
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.35 2007/11/04 23:11:22 tupone Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.36 2008/04/30 15:40:10 nyhm Exp $
+
+  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
 
 *enigma-1.01 (04 Nov 2007)
 
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 0ce32b693b13..4929882de549 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX enigma-1.00-autotools.patch 2865 RMD160 a8415815e2f73be9f89066e58e712ffc8cc784c8 SHA1 4b9dd11660428438a32d5a5cee8304e8a5045279 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1
 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
 DIST enigma-1.00.tar.gz 10466968 RMD160 a2ddd9600cddaf6b52c02af1c5631c8c4cd69045 SHA1 693a76e9f94e5188839c3bf7bcf32ccd0b04d84e SHA256 c44f36ef28c8bed1f5d5090edbe4cedda6f37472e729eed3406a350365ca32be
 DIST enigma-1.01.tar.gz 10847953 RMD160 9dd91152cfced5352a669e8921fdbb270c0abc4e SHA1 93f96ddd152e7474488cbb27ce0923312a851a9c SHA256 e704737676e89c509b19f1071284a6df7335a001da08bd116afded4c5e724fbb
 EBUILD enigma-1.00-r2.ebuild 1096 RMD160 27d626b576a7e162da9067ccfaf41fcfb5f4ec80 SHA1 446bebbafc15e6ec777158914e8f2f892d32744a SHA256 06558c291228dbc8b85ccd4c2e19ece9837fc9d05e229698ec62a2df9f6e634e
-EBUILD enigma-1.01.ebuild 1097 RMD160 e36838a417966fb10c411b7575c62458f7228efe SHA1 877fc532346e7bd6f928526df8788022687a8d1d SHA256 0d851f0f6343626a76d0265a1f54311977ddbe3acce0dfef6e2238abcf18d376
-MISC ChangeLog 5650 RMD160 4dabbe6d1e8d2574e9b92377044d8c1711d0cae5 SHA1 7543fb5f8ac0a835833115cbc92b6c6362c02a28 SHA256 c70dabdcb1533a133d77cc069714fcdce29bc4347adf0e3c30c1d32a98a933f3
+EBUILD enigma-1.01.ebuild 1134 RMD160 3acf610da54559188b670406378a70bdd093a8c9 SHA1 be483434741941a20c11bee86f0b10654633b27b SHA256 35de17656fb16232926dccfa09cf7f8dc5a23b7a95d66760f58a7a888b767093
+MISC ChangeLog 5819 RMD160 f780a3662707eae8ff90f6f2242669f08dd899fe SHA1 f27c17c70018acda162b67f821a1a0be40d2c58c SHA256 231fbea7321cb4384905bb00272d98f6491a2ed046eb400980d94e09ea6001bb
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgYkuAACgkQdz7hIScOURFvPACZATfNTldTfu9ZYkRnq6MAdw8G
+lnUAoLE0B+iuf4P7KHRj4KNGqZvhgoAo
+=CG9k
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/enigma/enigma-1.01.ebuild b/games-puzzle/enigma/enigma-1.01.ebuild
index fe2e1769c669..11a4bb2e5b61 100644
--- a/games-puzzle/enigma/enigma-1.01.ebuild
+++ b/games-puzzle/enigma/enigma-1.01.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-puzzle/enigma/enigma-1.01.ebuild,v 1.1 2007/11/04 23:11:22 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.01.ebuild,v 1.2 2008/04/30 15:40:10 nyhm Exp $
 
 inherit autotools eutils games
 
@@ -27,7 +27,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	cp /usr/share/gettext/config.rpath .
-	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch \
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }
 
diff --git a/games-puzzle/enigma/files/enigma-1.01-gcc43.patch b/games-puzzle/enigma/files/enigma-1.01-gcc43.patch
new file mode 100644
index 000000000000..32fba0caca98
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.01-gcc43.patch
@@ -0,0 +1,40 @@
+--- lib-src/enigma-core/ecl_util.hh
++++ lib-src/enigma-core/ecl_util.hh
+@@ -20,6 +20,7 @@
+ #define ECL_UTIL_HH_INCLUDED
+ 
+ #include <string>
++#include <algorithm>
+ 
+ /* hide GNU extensions for non-gnu compilers: */
+ #ifndef __GNU__
+--- src/Utf8ToXML.cc
++++ src/Utf8ToXML.cc
+@@ -21,6 +21,7 @@
+ #include "main.hh"
+ #include <xercesc/util/XMLString.hpp>
+ #include <xercesc/util/TransService.hpp>
++#include <cstring>
+ 
+ XERCES_CPP_NAMESPACE_USE
+ 
+--- src/file.hh
++++ src/file.hh
+@@ -22,6 +22,7 @@
+ #include <iosfwd>
+ #include <vector>
+ #include <list>
++#include <memory>
+ #include "ecl_error.hh"
+ 
+ namespace enigma
+--- src/gui/widgets.cc
++++ src/gui/widgets.cc
+@@ -28,6 +28,7 @@
+ #include <cassert>
+ #include <algorithm>
+ #include <iostream>
++#include <climits>
+ 
+ using namespace enigma::gui;
+ using namespace ecl;