Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 73 insertions, 6 deletions

diff --git a/games-puzzle/xlogical/ChangeLog b/games-puzzle/xlogical/ChangeLog
index 74b228240223..bb59021958d4 100644
--- a/games-puzzle/xlogical/ChangeLog
+++ b/games-puzzle/xlogical/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/xlogical
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/ChangeLog,v 1.3 2008/02/05 16:53:34 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/ChangeLog,v 1.4 2008/05/04 21:08:55 nyhm Exp $
+
+  04 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/xlogical-1.0.7-gcc43.patch, xlogical-1.0.7.ebuild:
+  Fix building with gcc-4.3
 
   05 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> xlogical-1.0.7.ebuild:
   Keyworded ~amd64 wrt #208952
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
index 8befd6239321..4e45520f2bd4 100644
--- a/games-puzzle/xlogical/Manifest
+++ b/games-puzzle/xlogical/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xlogical-1.0.7-gcc41.patch 1121 RMD160 1922b92b0ac2513760d76031d7236134bf083664 SHA1 e2f164d792b5ab02b5711eeb8048e2131c70b712 SHA256 d70f35be5bbf65e7511d239d2449e332c71f93a5af632169c95a3262448fcc4a
+AUX xlogical-1.0.7-gcc43.patch 915 RMD160 79aafb8d623bbdf75cc8aefca0014a56be3af665 SHA1 7e9546501df00c6e0ba11155753940876303705d SHA256 fd8394829ba2a3726b25f0bb5d651e3920e5c945f023fca57d2044227e4e8ec7
 DIST xlogical-1.0-7.tar.bz2 1853575 RMD160 f290e0e41c607a2a3e567f093ddb59d015f12a77 SHA1 197ea5bcdd25babc6af427b11de9f4a67ae4d570 SHA256 166d227770dcb7d94138f844a8a81380eff3fac7f564274bb2c66ae974e8e7ca
-EBUILD xlogical-1.0.7.ebuild 1251 RMD160 d924b34d84eebee7cd5f3fd1e20767c4b1553a27 SHA1 28b6202a875668fc5d87f00918daa8d63a391c56 SHA256 818af1760ba59c3fdc747c38013fe4043fb95e0b20a542630e6e2b34f4224e43
-MISC ChangeLog 602 RMD160 7adfe683c21a26643a7b3f2c8ed1fe2d7f516bfc SHA1 2aaa31ce7c8369d3df17cbbe1f505d931a23ef19 SHA256 b99564fa69e15c0f60a9c22a2f1279a5095525abcd6ae1ea3ae024ae76f78edb
+EBUILD xlogical-1.0.7.ebuild 1285 RMD160 f5cc0fb8103dbab8b846e8618735bf9fe25dbf36 SHA1 59a51f09961b0ab03b657bc739552034baae8223 SHA256 fd2588abb13d1e5f9f00adbdb4f5516e061d7436d0d8352b677cb4a845d57e44
+MISC ChangeLog 735 RMD160 fdf260c71f331ead6e85f4664b5f53a592db4974 SHA1 cad0f5ea7abef07a7450885a60eacacb53bf88ce SHA256 2e89f163b43b89cb56e1adc3757b335aa0b4db78c1abf151b4a8209db52d664f
 MISC metadata.xml 336 RMD160 fef2462eb3b75537c7d0e11de691c31612bf7efb SHA1 c8367ee566bf5b39f52a104575e603eb5087c543 SHA256 2ca74dcd27b11352491f9d35689976309ba158b80d8ec457c14561536104b1bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgeJe0ACgkQdz7hIScOURG2pACfRvUY29yQ8W97vgAFKewCaahg
+ltIAn0ahbqpGTx7JNVq54krAjpbRXEBk
+=vg+v
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
new file mode 100644
index 000000000000..4b64fcd67783
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
@@ -0,0 +1,51 @@
+--- gamelogic.cpp
++++ gamelogic.cpp
+@@ -25,6 +25,7 @@
+ #include<fstream>
+ #include<cstdio>
+ #include<cctype>
++#include <cstdlib>
+ 
+ #ifndef WIN32
+ #include<unistd.h>
+--- levelmap.cpp
++++ levelmap.cpp
+@@ -21,6 +21,7 @@
+ ////////////////////////////////////////////////////////////////////////

+ 

+ // Language Includes

++#include <cstdlib>
+ #include <cstdio>

+ #include <cctype>

+ #include <cstring>

+--- mapedit.cpp
++++ mapedit.cpp
+@@ -26,6 +26,8 @@
+ #include<cstdio>

+ #include<list>

+ #include<vector>

++#include <cstdlib>
++#include <cstring>
+ 

+ #ifndef WIN32

+ #include<unistd.h>

+--- modlist.cpp
++++ modlist.cpp
+@@ -22,6 +22,7 @@
+ 

+ #include <iostream>

+ #include <fstream>

++#include <cstdlib>

+ 

+ #ifdef WIN32

+ #include <afxwin.h>

+--- tile_spinner.cpp
++++ tile_spinner.cpp
+@@ -24,6 +24,7 @@
+ 
+ 
+ // Application Includes
++#include <cstdlib>
+ #include "audio.h"
+ #include "properties.h"
+ #include "defs.h"
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
index 875c17054005..872f8c1fa509 100644
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/xlogical-1.0.7.ebuild,v 1.5 2008/02/05 16:53:34 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xlogical/xlogical-1.0.7.ebuild,v 1.6 2008/05/04 21:08:55 nyhm Exp $
 
 inherit autotools versionator eutils games
 
 MY_PV=$(replace_version_separator 2 '-' )
 MY_P=${PN}-${MY_PV}
-
 DESCRIPTION="SDL logical clone"
 HOMEPAGE="http://changeling.ixionstudios.com/xlogical/"
 SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2"
@@ -27,7 +26,9 @@ src_unpack() {
 	cd "${S}"
 	sed -i '/^CXXFLAGS/d' Makefile.am || die "sed failed"
 	edos2unix properties.h anim.h exception.h
-	epatch "${FILESDIR}/${P}"-gcc41.patch
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }