gcc34 patch from Marco Squarcina via bug #73763

diff --git a/games-action/clanbomber/ChangeLog b/games-action/clanbomber/ChangeLog
index 1ce1bb7160e041884920afced8bc4fcb8cf76bff..a710489bd7a40f86afc910d8b6e86ca2c3abb084 100644 (file)
--- a/games-action/clanbomber/ChangeLog
+++ b/games-action/clanbomber/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/clanbomber
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.4 2004/06/24 21:53:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.5 2004/12/08 09:33:33 mr_bones_ Exp $
+
+  08 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.05-gcc34.patch, clanbomber-1.05.ebuild:
+  gcc34 patch from Marco Squarcina via bug #73763
 
 *clanbomber-1.05 (16 Feb 2004)
 

diff --git a/games-action/clanbomber/Manifest b/games-action/clanbomber/Manifest
index 8989a587ad61bc2ffcb1f1f8bf5527c0b5d9f49c..f737ebb5861bc6fb77cc357231fe7e8c86aea501 100644 (file)
--- a/games-action/clanbomber/Manifest
+++ b/games-action/clanbomber/Manifest
@@ -1,5 +1,6 @@
-MD5 9802c0debb23dfefb27aa3bdac592d53 ChangeLog 641
+MD5 692c9c17d6720e04ac868d3555f214ea ChangeLog 799
 MD5 042c680a45dc47c6b52b7f6643ef0ae2 metadata.xml 664
-MD5 f5d44857e66661fc49082136bdc762e5 clanbomber-1.05.ebuild 1083
+MD5 3c64bccd9d2249e2932acdcd417bb0fa clanbomber-1.05.ebuild 1121
+MD5 c6665b091bed73321a274dc78cd38973 files/1.05-gcc34.patch 281
 MD5 fe0f8b2ccaef47cc0612a83d6cb0cea8 files/digest-clanbomber-1.05 68
 MD5 18333125f34d58cb129c22c86ad7ef50 files/1.05-no-display.patch 1217

diff --git a/games-action/clanbomber/clanbomber-1.05.ebuild b/games-action/clanbomber/clanbomber-1.05.ebuild
index d7281b9d1c85813df388c760b9ea355e2f036f57..aa7e3e02e4a7f77f622909248fbed0ce23e413ba 100644 (file)
--- a/games-action/clanbomber/clanbomber-1.05.ebuild
+++ b/games-action/clanbomber/clanbomber-1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-1.05.ebuild,v 1.3 2004/08/15 08:55:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-1.05.ebuild,v 1.4 2004/12/08 09:33:33 mr_bones_ Exp $
 
 inherit games eutils flag-o-matic
 
@@ -27,6 +27,7 @@ src_unpack() {
                clanbomber/{,*/}Makefile.in \
                || die "sed failed"
        epatch "${FILESDIR}/${PV}-no-display.patch"
+       epatch "${FILESDIR}/${PV}-gcc34.patch"
 }
 
 src_compile() {
@@ -38,6 +39,6 @@ src_compile() {
 
 src_install() {
        make DESTDIR=${D} install || die "make install failed"
-       dodoc AUTHORS ChangeLog IDEAS QUOTES README TODO
+       dodoc AUTHORS ChangeLog IDEAS QUOTES README
        prepgamesdirs
 }

diff --git a/games-action/clanbomber/files/1.05-gcc34.patch b/games-action/clanbomber/files/1.05-gcc34.patch
new file mode 100644 (file)
index 0000000..c9f4a73
--- /dev/null
+++ b/games-action/clanbomber/files/1.05-gcc34.patch
@@ -0,0 +1,15 @@
+--- clanbomber/Config.cpp      2004-11-21 10:19:16.303654776 +0100
++++ clanbomber/Config.cpp.new  2004-11-21 10:20:33.042988624 +0100
+@@ -23,6 +23,12 @@
+ 
+ #include "Controller.h"
+ 
++#ifdef min
++#undef min
++#endif
++#ifdef max
++#undef max
++#endif
+ #include <fstream>
+ #include <cstdio>
+