Patch to fix building with gcc-4.3 from Peter Alfredsen, bug #218837

Package-Manager: portage-2.1.5_rc6

4 files changed, 89 insertions, 6 deletions

diff --git a/games-strategy/netpanzer/ChangeLog b/games-strategy/netpanzer/ChangeLog
index 5eb61e0d5d9c..1e7764d9f916 100644
--- a/games-strategy/netpanzer/ChangeLog
+++ b/games-strategy/netpanzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/netpanzer
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.27 2007/11/21 04:26:02 dirtyepic Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.28 2008/04/30 17:06:37 nyhm Exp $
+
+  30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/netpanzer-0.8.2-gcc43.patch, netpanzer-0.8.2.ebuild:
+  Patch to fix building with gcc-4.3 from Peter Alfredsen, bug #218837
 
   21 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> netpanzer-0.8.1.ebuild:
   Also allow building 0.8.2 with ftjam for bug #188194
diff --git a/games-strategy/netpanzer/Manifest b/games-strategy/netpanzer/Manifest
index 9620dca868e6..699980ebc25f 100644
--- a/games-strategy/netpanzer/Manifest
+++ b/games-strategy/netpanzer/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX netpanzer-0.8.2-gcc43.patch 2241 RMD160 9d992c6b511b092fea1968489883c0897439cf3d SHA1 cbad8e3c9d9f34c0846bd54b61939ee86755f19b SHA256 b2c150dee78272d317e57b019f491c5ab1a7a29f9708c9da5791f6b68a486b60
 AUX netpanzer-ded 359 RMD160 b3d0ee87b0aad2761ded85ee916c208e2188c043 SHA1 ab6085c7befd3a8d99bc0c93b3fb1ba1ccd7710d SHA256 4b49ecaa63b76c35532d0eea2825d9d6fa9655772f47407497ce3fabce0e1760
 AUX netpanzer-ded.ini 1261 RMD160 95f3d05b5660de90aae7fdb5001c2108f852071e SHA1 f890b22a577ce41c7e995848776fbc35b1c8d942 SHA256 39ae0151857304a53d62cc6623f3943b492bd9543da4c072a561f9475c0f8f51
 AUX netpanzer.rc 895 RMD160 765d8e4fdf1dbef47dce7d5396d9f4263607ee6e SHA1 6b48f9116df27ec22430890f5b2393f37589747a SHA256 da3b564ac25918a070d570c3cfc297a51996a58ee3c666622b34d8efe8012436
@@ -5,6 +9,13 @@ DIST netpanzer-0.8.1.tar.bz2 392603 RMD160 082f74e593e1097af952b53c4b4bb8b6014b8
 DIST netpanzer-0.8.2.tar.bz2 10416147 RMD160 3a39a309d3fd3170e37558de982d3ab6ea77ceb3 SHA1 99b0a79ffe4c8bf3a155c7555dff06e00def4023 SHA256 bc70badec3a846cca8090b6ecda388956c01053b7ea2596b44c730bcc29e3979
 DIST netpanzer-data-0.8.tar.bz2 10123751 RMD160 a2746ba759b61a1ddc31847144e407674dc46900 SHA1 4fec331aab570a2d76895c5799fadcfe1ad933eb SHA256 0ed4398f5e0a796422474fcc518934d74ceb056ca7ab624d8d239b749535277b
 EBUILD netpanzer-0.8.1.ebuild 1801 RMD160 25c3052a91d5e5a3e0e5cf67390e385dfb8945fd SHA1 2f2042cea184bd8580f26b3215fad0e769267134 SHA256 0192c0d924e410b93e29f982624b261c6c7ec758291f04430bfa4b45c6c96eb7
-EBUILD netpanzer-0.8.2.ebuild 1801 RMD160 aacdf617cc83c9d4e8d89037a5ac07d92ddc373f SHA1 7dab03b2be4c3db44a593b5b402349cc7b3d0af6 SHA256 0c8d67daa135d5d27689e988ee9b4becfde2c8878e07eed2fbc81ba3b9f9c570
-MISC ChangeLog 4629 RMD160 2515c180eb710a1bbcf8c4053df64989267fa00c SHA1 8370f1a91ce1b281a0594627015a460504214501 SHA256 ed441176d5aaf5c021c039ecf267a404ddb76eb39bde7636b756da24d9c679ed
+EBUILD netpanzer-0.8.2.ebuild 1880 RMD160 4e77c347dbb5cdc7fa9af7154d0ae0535ed58187 SHA1 e81de44c8888679ae469b1c3f2f3efcf7b82ba80 SHA256 3414d32c31240c65e1867ed6cf07fca4f17383a7edbdab95106e5c7d1e77b1d1
+MISC ChangeLog 4806 RMD160 e370045aeb8b9acf2f41a3a33d16c38ae3fe6424 SHA1 370e0272317842099d2d23312e5c5fbc4d17f3de SHA256 87d9f3a30a2729c4128c3c14fc481fe5916dbe322e709349d640b5d6421e9976
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgYpyMACgkQdz7hIScOURHgfwCfff4xPa5LJ9Ez9pHZqnG8KkdA
+kiUAniCA14Wgxksfymf94A3DpGcBWLU6
+=YnQv
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch
new file mode 100644
index 000000000000..cf73ba4c2252
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch
@@ -0,0 +1,62 @@
+Index: netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/2D/ColorTable.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -17,6 +17,8 @@
+ */
+ #include <config.h>
+ 
++#include <memory>
++
+ #include "Util/FileSystem.hpp"
+ #include "Util/Log.hpp"
+ #include "Util/Exception.hpp"
+Index: netpanzer-0.8.2/src/Lib/2D/Palette.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/2D/Palette.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/2D/Palette.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <config.h>
+ 
+ #include <math.h>
++#include <memory>
+ 
+ #include "Palette.hpp"
+ #include "Util/FileSystem.hpp"
+Index: netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/NetPanzer/Network/ProxyServer.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -17,6 +17,7 @@
+ */
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <string>
+ #include <stdexcept>
+ #include <ctype.h>
+Index: netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -17,6 +17,7 @@
+ */
+ #include <config.h>
+ 
++#include <memory>
+ #include <vector>
+ #include <string>
+ #include "MapSelectionView.hpp"
+Index: netpanzer-0.8.2/src/Lib/Util/Log.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/Util/Log.cpp	2008-02-05 17:13:36.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/Util/Log.cpp	2008-02-05 17:13:43.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <vector>
+ #include <exception>
+ #include <iomanip>
++#include <algorithm>
+ 
+ #include "Exception.hpp"
+ #include "FileSystem.hpp"
+
diff --git a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild b/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
index c6cfc0dbde00..0c8715e01544 100644
--- a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
+++ b/games-strategy/netpanzer/netpanzer-0.8.2.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-strategy/netpanzer/netpanzer-0.8.2.ebuild,v 1.2 2007/11/20 17:26:08 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8.2.ebuild,v 1.3 2008/04/30 17:06:37 nyhm Exp $
 
 inherit eutils games
 
@@ -23,6 +23,12 @@ RDEPEND="dedicated? ( app-misc/screen )
 DEPEND="${RDEPEND}
 	|| ( dev-util/ftjam dev-util/jam )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	egamesconf || die
 	jam -q || die "jam failed"