diff options
author | Tristan Heaven <nyhm@gentoo.org> | 2007-07-22 12:23:59 +0000 |
---|---|---|
committer | Tristan Heaven <nyhm@gentoo.org> | 2007-07-22 12:23:59 +0000 |
commit | f63099f4467083b2555124ea5ae9d6188d79d75e (patch) | |
tree | 4c667b13ff656965fde43b3e377b8bd443de3720 /games-board | |
parent | Version bump (diff) | |
download | gentoo-2-f63099f4467083b2555124ea5ae9d6188d79d75e.tar.gz gentoo-2-f63099f4467083b2555124ea5ae9d6188d79d75e.tar.bz2 gentoo-2-f63099f4467083b2555124ea5ae9d6188d79d75e.zip |
Fix 'r' key in mastermind, bug #179519
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'games-board')
-rw-r--r-- | games-board/ace/ChangeLog | 8 | ||||
-rw-r--r-- | games-board/ace/ace-1.2-r2.ebuild (renamed from games-board/ace/ace-1.2-r1.ebuild) | 8 | ||||
-rw-r--r-- | games-board/ace/files/ace-1.2-mastermind-keys.patch | 16 | ||||
-rw-r--r-- | games-board/ace/files/digest-ace-1.2-r2 (renamed from games-board/ace/files/digest-ace-1.2-r1) | 0 |
4 files changed, 28 insertions, 4 deletions
diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog index ee0c2078a9e7..70911aede7a4 100644 --- a/games-board/ace/ChangeLog +++ b/games-board/ace/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-board/ace # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.15 2007/06/10 14:58:56 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.16 2007/07/22 12:23:59 nyhm Exp $ + +*ace-1.2-r2 (22 Jul 2007) + + 22 Jul 2007; Tristan Heaven <nyhm@gentoo.org> + +files/ace-1.2-mastermind-keys.patch, +ace-1.2-r2.ebuild: + Fix 'r' key in mastermind, bug #179519 10 Jun 2007; Tristan Heaven <nyhm@gentoo.org> ace-1.2-r1.ebuild: Block games-misc/bsd-games because they collide on /usr/games/bin/canfield diff --git a/games-board/ace/ace-1.2-r1.ebuild b/games-board/ace/ace-1.2-r2.ebuild index e928bce0dea3..8adacadddec3 100644 --- a/games-board/ace/ace-1.2-r1.ebuild +++ b/games-board/ace/ace-1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.18 2007/06/10 14:58:56 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r2.ebuild,v 1.1 2007/07/22 12:23:59 nyhm Exp $ inherit eutils games @@ -20,8 +20,10 @@ DEPEND="x11-libs/libXpm src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}"-check_for_end_of_game.patch \ - "${FILESDIR}/${P}"-gcc41.patch + epatch \ + "${FILESDIR}"/${P}-check_for_end_of_game.patch \ + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-mastermind-keys.patch # Fix timestamps so we dont run autotools #76473 touch -r aclocal.m4 configure.in diff --git a/games-board/ace/files/ace-1.2-mastermind-keys.patch b/games-board/ace/files/ace-1.2-mastermind-keys.patch new file mode 100644 index 000000000000..2678e14fcb1f --- /dev/null +++ b/games-board/ace/files/ace-1.2-mastermind-keys.patch @@ -0,0 +1,16 @@ +=================================================================== +RCS file: /cvs/ace/ace/games/mastermind.c,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -p -u -r1.5 -r1.6 +--- ace/games/mastermind.c 2001/09/21 19:22:51 1.5 ++++ /cvs/ace/ace/games/mastermind.c 2003/02/11 18:35:59 1.6 +@@ -210,7 +210,7 @@ key(int k, int x, int y) + } + if (k == 3 || k == 27 || k == 'q') + exit(0); +- if (k == KEY_F(2) || k == 'r') ++ if (k == KEY_F(2)) + { + start_again(); + invalidate(0, 0, table_width, table_height); diff --git a/games-board/ace/files/digest-ace-1.2-r1 b/games-board/ace/files/digest-ace-1.2-r2 index dd0d57470b27..dd0d57470b27 100644 --- a/games-board/ace/files/digest-ace-1.2-r1 +++ b/games-board/ace/files/digest-ace-1.2-r2 |