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
commitaf408b4b329ef26eaca1219f843bc8866d246377 (patch)
tree729ab77d13e4d854d7843bb0d747aaa676d4e103 /games-misc/bsd-games
parentremove unused net-www/mplayerplug-in:mplayer-bin use flag (diff)
downloadhistorical-af408b4b329ef26eaca1219f843bc8866d246377.tar.gz
historical-af408b4b329ef26eaca1219f843bc8866d246377.tar.bz2
historical-af408b4b329ef26eaca1219f843bc8866d246377.zip
fix building with gcc43 (bug #229759 with patch submitted by Ewan Marshall)
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'games-misc/bsd-games')
-rw-r--r--games-misc/bsd-games/ChangeLog8
-rw-r--r--games-misc/bsd-games/Manifest5
-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
4 files changed, 29 insertions, 7 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/Manifest b/games-misc/bsd-games/Manifest
index 8dce0261854d..927295c3208b 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -1,12 +1,13 @@
AUX bsd-games-2.17-64bit.patch 1322 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f28773d SHA1 0bd044bff85f18cf188dd6068c297dda17196865 SHA256 cbe649fa75bc3e16f27032d05b8ce770ae036df83435211e429379852528fcfe
AUX bsd-games-2.17-bg.patch 732 RMD160 c7f5c44b151111e1da8b493c6e376b61e187a6b9 SHA1 197ae9a7ce927bbc1331aaa4f7b28eb971e75f4e SHA256 d25eb2b0e6790b6a852bce08f384994fed7b37a9d33d12d01b65e67fbd8f67d7
AUX bsd-games-2.17-gcc4.patch 893 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296bb SHA1 adbdf06c228ee81ccc0a694db979ae4aab7591bc SHA256 96639f25206401c0dde3f9f28ac287c9e26c3efb526481fa48b482f8c9ab4ac0
+AUX bsd-games-2.17-gcc43.patch 741 RMD160 11c2be32ee2d610f7e379bf724bb0b7272247b2c SHA1 7bfa30aefe38340ea8a2c214f39a23d259b45cd6 SHA256 7b07a21db2d5198f8a698ad3772b355424dd58cab04dc12cf2a4c749c9eed7ee
AUX bsd-games-2.17-headers.patch 268 RMD160 cc0e97f981581c0635e549ce41d97549c2f7ed33 SHA1 ebce73dc15fc11859fb4ca577dbdd977628b1501 SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7
AUX bsd-games-2.17-tetris.patch 1125 RMD160 1647a0e7231da97c420e28facd30584557567b75 SHA1 77400661025d9567e129f66fc902471d853a0cb6 SHA256 53ee0ee8114bf6450f18f86c70916711bad3409220e78fe2751d01e6897e8725
AUX config.params-gentoo 1204 RMD160 2a76258f9da2641d0c2465d40dba461eb3a91452 SHA1 3cba205238ab8cb08347bff219fa66dedb376fca SHA256 74737471f9fa6a3f523d8e91af65a175cccfa94ce162eb8e5ecef08372047414
DIST bsd-games-2.17.tar.gz 2563311 RMD160 a8f9c829bb09dfa071ecafbd6cb15560dba888d8 SHA1 8e48a9808908e2898126fdd285196ab71c9a59c0 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
DIST bsdgames_2.17-7.diff.gz 12530 RMD160 4c213632111ac8035058214889fd9229723b9785 SHA1 e19b34faeea0941395e07d78e74939837f5aa70c SHA256 41b4b99ae96f1b42beb37818f377cc194ab4146fe845818e8d29663d4f52ff88
EBUILD bsd-games-2.17-r2.ebuild 4017 RMD160 b084b55f04a830dae98c3c0dbb9e37dde4f5a71a SHA1 40456bbf3e91fd5c2d5a62b58671902f7581f694 SHA256 b636e87eae9b5e8ab72d5e6195fa1e5bd3a351dd2d0b02f3e1c2f7ad5bcc29e2
-EBUILD bsd-games-2.17-r3.ebuild 4054 RMD160 eede7bc672e053beffdd684420e68774be116663 SHA1 1b4ccbe6da799191a2e90efef65f6d471a6b580c SHA256 e9467a480b267cef09b28a9c2b44efca356c17673b7c58f234df4058dac904ff
-MISC ChangeLog 4527 RMD160 2173a9b4cc599f9f4ceb4d0c6b2c13680a680bbf SHA1 9d9f9e1ddda0e37dba73c16c1c8bd7423baf3340 SHA256 a99c121eab30386e67eaa490eba68d7083011f6b1266d21854420c27de91fa97
+EBUILD bsd-games-2.17-r3.ebuild 4094 RMD160 2949e69d7e9ea2a07bc5300e70c4b5061a7f79c0 SHA1 9ae6a0363828b0db1ba4b76a45891fcfdb28e36f SHA256 0dffa6801be9e6ac987713d1a5522031ab3eae040078ada792c7d174a9934700
+MISC ChangeLog 4729 RMD160 6af7f36241fb8d8c6a19d2d30e5090840da02c33 SHA1 e853e5c624dad5576b5422241489238f7264ebec SHA256 d420c9516185dc420899a31e6b6cb10f614a05b92ed9751475fc7ffa93fdc7dc
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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
+ };
+
+