summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-01-22 10:20:48 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-01-22 10:20:48 +0000
commitec3ac0eb3c22e0f1ce3d2103e62668a1f22547c9 (patch)
treedf3696808fa24d17f19adb600f8b1415062ffdc5 /games-action/clanbomber
parentusemask links[livecd] on bsd since it requires gpm (diff)
downloadgentoo-2-ec3ac0eb3c22e0f1ce3d2103e62668a1f22547c9.tar.gz
gentoo-2-ec3ac0eb3c22e0f1ce3d2103e62668a1f22547c9.tar.bz2
gentoo-2-ec3ac0eb3c22e0f1ce3d2103e62668a1f22547c9.zip
Fix gcc-4.3 bug #227937
Fix build with dev-libs/DirectFb-1* (Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 x86_64)
Diffstat (limited to 'games-action/clanbomber')
-rw-r--r--games-action/clanbomber/ChangeLog9
-rw-r--r--games-action/clanbomber/clanbomber-2.0.9.1.ebuild10
-rw-r--r--games-action/clanbomber/files/clanbomber-2.0.9.1-gcc43.patch63
3 files changed, 78 insertions, 4 deletions
diff --git a/games-action/clanbomber/ChangeLog b/games-action/clanbomber/ChangeLog
index 201d73e29e8c..894cc29b02a3 100644
--- a/games-action/clanbomber/ChangeLog
+++ b/games-action/clanbomber/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-action/clanbomber
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.9 2008/02/15 01:51:15 nyhm Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.10 2009/01/22 10:20:48 tupone Exp $
+
+ 22 Jan 2009; Alfredo Tupone <tupone@gentoo.org>
+ +files/clanbomber-2.0.9.1-gcc43.patch, clanbomber-2.0.9.1.ebuild:
+ Fix gcc-4.3 bug #227937 by Evil Compile Person
+ Fix build with dev-libs/DirectFb-1*
*clanbomber-2.0.9.1 (15 Feb 2008)
diff --git a/games-action/clanbomber/clanbomber-2.0.9.1.ebuild b/games-action/clanbomber/clanbomber-2.0.9.1.ebuild
index 1527b64f305c..87a25aaf0c86 100644
--- a/games-action/clanbomber/clanbomber-2.0.9.1.ebuild
+++ b/games-action/clanbomber/clanbomber-2.0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-2.0.9.1.ebuild,v 1.1 2008/02/15 01:51:15 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-2.0.9.1.ebuild,v 1.2 2009/01/22 10:20:48 tupone Exp $
inherit eutils versionator games
@@ -19,6 +19,12 @@ DEPEND=">=dev-libs/DirectFB-1
S=${WORKDIR}/${MY_P}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
newicon ${PN}/pics/cup2.png ${PN}.png
diff --git a/games-action/clanbomber/files/clanbomber-2.0.9.1-gcc43.patch b/games-action/clanbomber/files/clanbomber-2.0.9.1-gcc43.patch
new file mode 100644
index 000000000000..7257f630aa52
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-2.0.9.1-gcc43.patch
@@ -0,0 +1,63 @@
+--- clanbomber/ClientSetup.cpp.old 2009-01-22 10:16:04.000000000 +0100
++++ clanbomber/ClientSetup.cpp 2009-01-22 10:18:23.000000000 +0100
+@@ -14,6 +14,7 @@
+ * *
+ ***************************************************************************/
+
++#define DIRECTFB_ENABLE_DEPRECATED
+ #include "ClientSetup.h"
+
+ #include "ClanBomber.h"
+--- clanbomber/ClanBomber.cpp.old 2009-01-22 10:26:30.000000000 +0100
++++ clanbomber/ClanBomber.cpp 2009-01-22 10:24:57.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <unistd.h>
+ #include <math.h>
+
++#define DIRECTFB_ENABLE_DEPRECATED
+ #include <directfb.h>
+
+ #include "ClanBomber.h"
+--- clanbomber/Client.cpp.old 2009-01-22 10:28:56.000000000 +0100
++++ clanbomber/Client.cpp 2009-01-22 10:30:36.000000000 +0100
+@@ -204,7 +204,7 @@
+ int bytes_received=-1;
+ int buf[4096];
+ int bufsize=sizeof(buf);
+- size_t addr_len=sizeof(struct sockaddr);
++ socklen_t addr_len=sizeof(struct sockaddr);
+ memset((char*)&server_addr, 0, addr_len);
+ int brecv=recvfrom(my_udp_socket, buf, bufsize, 0, (sockaddr*)&server_addr, &addr_len);
+ bytes_received=brecv;
+--- clanbomber/GameStatus.cpp.old 2009-01-22 10:32:43.000000000 +0100
++++ clanbomber/GameStatus.cpp 2009-01-22 10:33:13.000000000 +0100
+@@ -19,6 +19,8 @@
+ #include <stdio.h>
+ #include <math.h>
+
++#define DIRECTFB_ENABLE_DEPRECATED
++
+ #include <directfb.h>
+
+ #include "ClanBomber.h"
+--- clanbomber/Resources.h.old 2009-01-22 10:37:27.000000000 +0100
++++ clanbomber/Resources.h 2009-01-22 10:35:02.000000000 +0100
+@@ -19,6 +19,7 @@
+ #ifndef RESOURCES_H
+ #define RESOURCES_H
+
++#define DIRECTFB_ENABLE_DEPRECATED
+ #include <directfb.h>
+ #include <fusionsound.h>
+
+--- clanbomber/Server.cpp.old 2009-01-22 10:41:10.000000000 +0100
++++ clanbomber/Server.cpp 2009-01-22 10:41:34.000000000 +0100
+@@ -295,7 +295,7 @@
+ int bytes_received=-1;
+ int buf[4096];
+ int bufsize=sizeof(buf);
+- size_t addr_len=sizeof(struct sockaddr);
++ socklen_t addr_len=sizeof(struct sockaddr);
+ memset((char*)&client_addr, 0, addr_len);
+ int brecv=recvfrom(my_udp_socket, buf, bufsize, 0, (sockaddr*)&client_addr, &addr_len);
+ bytes_received=brecv;