summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-12-08 09:33:33 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-12-08 09:33:33 +0000
commitec8b7d5ffa3879d701f9cbddff0eeb908aec38e9 (patch)
tree4903b9a6a509639ed41c115cc78cc44e115dc1b0 /games-action/clanbomber
parentclosing #73696 (Manifest recommit) (diff)
downloadgentoo-2-ec8b7d5ffa3879d701f9cbddff0eeb908aec38e9.tar.gz
gentoo-2-ec8b7d5ffa3879d701f9cbddff0eeb908aec38e9.tar.bz2
gentoo-2-ec8b7d5ffa3879d701f9cbddff0eeb908aec38e9.zip
gcc34 patch from Marco Squarcina via bug #73763
Diffstat (limited to 'games-action/clanbomber')
-rw-r--r--games-action/clanbomber/ChangeLog6
-rw-r--r--games-action/clanbomber/clanbomber-1.05.ebuild5
-rw-r--r--games-action/clanbomber/files/1.05-gcc34.patch15
3 files changed, 23 insertions, 3 deletions
diff --git a/games-action/clanbomber/ChangeLog b/games-action/clanbomber/ChangeLog
index 1ce1bb7160e0..a710489bd7a4 100644
--- 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/clanbomber-1.05.ebuild b/games-action/clanbomber/clanbomber-1.05.ebuild
index d7281b9d1c85..aa7e3e02e4a7 100644
--- 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
index 000000000000..c9f4a7397732
--- /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>
+