summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-08-11 05:35:30 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-08-11 05:35:30 +0000
commita80e7d4cc919d7f8da2eb55b86fc4850270b2591 (patch)
treebbcbaa45890cd07dd4d198ab40de1ce59f8ddaf5 /games-misc
parentremove unused net-www/mplayerplug-in:mplayer-bin use flag (diff)
downloadgentoo-2-a80e7d4cc919d7f8da2eb55b86fc4850270b2591.tar.gz
gentoo-2-a80e7d4cc919d7f8da2eb55b86fc4850270b2591.tar.bz2
gentoo-2-a80e7d4cc919d7f8da2eb55b86fc4850270b2591.zip
fix building with gcc43 (bug #229759 with patch submitted by Ewan Marshall)
(Portage version: 2.1.4.4)
Diffstat (limited to 'games-misc')
-rw-r--r--games-misc/bsd-games/ChangeLog8
-rw-r--r--games-misc/bsd-games/bsd-games-2.17-r3.ebuild7
-rw-r--r--games-misc/bsd-games/files/bsd-games-2.17-gcc43.patch16
3 files changed, 26 insertions, 5 deletions
diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index c72e311a69ab..b1c6f84b4b5e 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-misc/bsd-games
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.31 2007/06/10 14:56:46 nyhm Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.32 2008/08/11 05:35:30 mr_bones_ Exp $
+
+ 11 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/bsd-games-2.17-gcc43.patch, bsd-games-2.17-r3.ebuild:
+ fix building with gcc43 (bug #229759 with patch submitted by Ewan Marshall)
10 Jun 2007; Tristan Heaven <nyhm@gentoo.org> bsd-games-2.17-r2.ebuild,
bsd-games-2.17-r3.ebuild:
diff --git a/games-misc/bsd-games/bsd-games-2.17-r3.ebuild b/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
index 05cfd9a3e82e..ed71823e2347 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r3.ebuild,v 1.2 2007/06/10 14:56:46 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r3.ebuild,v 1.3 2008/08/11 05:35:30 mr_bones_ Exp $
inherit eutils games
@@ -39,7 +39,8 @@ src_unpack() {
"${FILESDIR}"/${P}-64bit.patch \
"${FILESDIR}"/${P}-headers.patch \
"${FILESDIR}"/${P}-bg.patch \
- "${FILESDIR}"/${P}-gcc4.patch
+ "${FILESDIR}"/${P}-gcc4.patch \
+ "${FILESDIR}"/${P}-gcc43.patch
sed -i \
-e "s:/usr/games:${GAMES_BINDIR}:" \
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc43.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc43.patch
new file mode 100644
index 000000000000..8009454e55a9
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-gcc43.patch
@@ -0,0 +1,16 @@
+--- dab/gamescreen.h.orig
++++ dab/gamescreen.h
+@@ -70,9 +70,9 @@
+ virtual void redraw(void) = 0; // Refresh
+ virtual int getinput(void) = 0; // Get user input
+ virtual void bell(void) = 0; // Beep
+- virtual void score(size_t p, const PLAYER& p) = 0; // Post current score
+- virtual void games(size_t p, const PLAYER& p) = 0; // Post games won
+- virtual void total(size_t p, const PLAYER& p) = 0; // Post total score
++ virtual void score(size_t s, const PLAYER& p) = 0; // Post current score
++ virtual void games(size_t s, const PLAYER& p) = 0; // Post games won
++ virtual void total(size_t s, const PLAYER& p) = 0; // Post total score
+ virtual void ties(const PLAYER& p) = 0; // Post tie games
+ };
+
+