Fix building with gcc-4.3

(Portage version: 2.1.5_rc6)

3 files changed, 126 insertions, 7 deletions

diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index d876c096728a..d15f6af14005 100644
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/quadra
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.18 2008/02/29 19:35:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.19 2008/05/02 22:35:13 nyhm Exp $
+
+  02 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/quadra-1.1.8-gcc43.patch, quadra-1.1.8.ebuild:
+  Fix building with gcc-4.3
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> quadra-1.1.8.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch b/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch
new file mode 100644
index 000000000000..59c0c7425a56
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch
@@ -0,0 +1,114 @@
+--- include/net_list.h
++++ include/net_list.h
+@@ -29,6 +29,7 @@
+ #include "net_stuff.h"
+ #include "stats.h"
+ #include "game.h"
++#include <cstring>
+ 
+ class Canvas;
+ 
+--- include/packets.h
++++ include/packets.h
+@@ -27,6 +27,7 @@
+ #include "game.h"
+ #include "config.h"
+ #include "track.h"
++#include <cstring>
+ 
+ enum Packet_type {
+ 	P_CHAT,
+--- skelton/common/http_request.cpp
++++ skelton/common/http_request.cpp
+@@ -18,7 +18,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ #include "error.h"
+ #include "net.h"
+ #include "http_request.h"
+--- skelton/common/res_compress.cpp
++++ skelton/common/res_compress.cpp
+@@ -21,6 +21,7 @@
+ #include "zlib.h"
+ #undef FAR
+ #include "res_compress.h"
++#include <cstring>
+ 
+ RCSID("$Id: quadra-1.1.8-gcc43.patch,v 1.1 2008/05/02 22:35:13 nyhm Exp $")
+ 
+--- skelton/common/reswriter.cpp
++++ skelton/common/reswriter.cpp
+@@ -18,7 +18,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ #include "res.h"
+ #include "resfile.h"
+ 
+--- skelton/include/net_buf.h
++++ skelton/include/net_buf.h
+@@ -23,6 +23,7 @@
+ 
+ #include "types.h"
+ #include "net.h"
++#include <cstring>
+ 
+ class Net_buf {
+ public:
+--- skelton/svgalib/main.cpp
++++ skelton/svgalib/main.cpp
+@@ -27,8 +27,9 @@
+ #ifndef NDEBUG
+ #include <mcheck.h>
+ #endif
+-#include <stdlib.h>
+-#include <signal.h>
++#include <cstdlib>
++#include <csignal>
++#include <cstring>
+ 
+ #include "debug.h"
+ #include "types.h"
+--- skelton/svgalib/sound.cpp
++++ skelton/svgalib/sound.cpp
+@@ -18,7 +18,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ #include <mcheck.h>
+ #include <linux/soundcard.h>
+--- skelton/svgalib/video_x11.cpp
++++ skelton/svgalib/video_x11.cpp
+@@ -20,7 +20,8 @@
+ 
+ #ifdef UGS_LINUX_X11
+ 
+-#include <signal.h>
++#include <csignal>
++#include <cstring>
+ #include <unistd.h>
+ #include <sys/shm.h>
+ #define Font XFont
+--- skelton/tools/wadder/wadder.cpp
++++ skelton/tools/wadder/wadder.cpp
+@@ -100,7 +100,8 @@
+ 
+ */
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ #include "stringtable.h"
+ #include "res.h"
+ 
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index d5606ed5aa6b..10a0e8996252 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.18 2008/02/29 19:35:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.19 2008/05/02 22:35:13 nyhm Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 x86"
 IUSE="svga"
 
 RDEPEND="x11-libs/libXpm
-	>=media-libs/libpng-1.2.1
+	media-libs/libpng
 	svga? ( media-libs/svgalib )"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto"
@@ -27,7 +27,8 @@ src_unpack() {
 		"${FILESDIR}"/libpng-1.2.5.patch \
 		"${FILESDIR}"/${P}-amd64.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-gcc42.patch
+		"${FILESDIR}"/${P}-gcc42.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
 		-e 's:-pedantic::' config/vars.mk \
 			|| die "sed config/vars.mk failed"
@@ -51,14 +52,14 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin ${PN}
+	dogamesbin ${PN} || die "dogamesbin failed"
 	if use svga; then
 		dogameslib.so ${PN}-svga.so || die "dogameslib.so failed"
 	fi
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins ${PN}.res
+	doins ${PN}.res || die "doins failed"
 	doicon images/${PN}.xpm
-	make_desktop_entry ${PN} "Quadra" ${PN}
+	make_desktop_entry ${PN} Quadra
 
 	dodoc ChangeLog NEWS README
 	dohtml help/*