Apply patch to fix implicit pointer conversion on x86_64 arches. Stable on amd64 wrt bug #343463

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 38 insertions, 6 deletions

diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog
index 5668301acec7..1846ca4c6a02 100644
--- a/games-board/ace/ChangeLog
+++ b/games-board/ace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/ace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.19 2010/09/29 22:07:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.20 2010/11/07 17:00:58 hwoarang Exp $
+
+  07 Nov 2010; Markos Chandras <hwoarang@gentoo.org> ace-1.3.ebuild,
+  +files/ace-1.3-implicit-pointer.patch:
+  Apply patch to fix implicit pointer conversion on x86_64 arches. Stable on
+  amd64 wrt bug #343463
 
 *ace-1.3 (29 Sep 2010)
 
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index 6f5f3205abe8..cf95d51ae81e 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ace-1.2-as-needed.patch 1290 RMD160 83180dff6da94f9bd7c7fdf99393f55f0ca83fc8 SHA1 abb804549082d8452827b508aea72696811ab14e SHA256 6157aecb445db6286eae9d7aafbb285d08dbc153f25e15cd9eceeb34371eb0fa
 AUX ace-1.2-check_for_end_of_game.patch 262 RMD160 f39618a843461e4e8f1d139b87e808b163f071d1 SHA1 c4d7d9b32f0de8882a2b9c59c0873497c7194586 SHA256 16c841454ac9c3552b4aa70c3ec3bafbb8db33fb1e2a85e0f36de1623e09179e
 AUX ace-1.2-gcc41.patch 2020 RMD160 c4b54b0a725508ab25c22ec633beb23b1a7035a5 SHA1 cc83372eb43277d83734dd38aa0286a135d618bd SHA256 45362fb9c87496fe6c0b84502d8e4a37ba37a8d4c389b749a1ef9920a2e85d60
 AUX ace-1.2-mastermind-keys.patch 522 RMD160 bd4556f14cc7f823364d829138edbd075c07eff3 SHA1 6626fa6d1a48115ee7ac7cb2ed540aca3d955064 SHA256 0911f51a28d897f0d6cdf3eee4d8f9ea5541204ed10ee146c6912d64de673117
+AUX ace-1.3-implicit-pointer.patch 332 RMD160 3244045392a207891764db9884ad697fc0cd5472 SHA1 fbfbe2e1622e313e3bd1c524383717aab399b9f4 SHA256 eb0f02425048347f5596e93cc5c0f93bf6ef3e46823e525ab8ca244c615b1a64
 AUX ace-1.3-no-xpm.patch 572 RMD160 f7d5675f909a274907210b846573b5937ad2dcf1 SHA1 5814cbf0131b9cc4ffceeb17431e5922b6733f03 SHA256 c2f2ad6cdcc774b8db07f69b45a9debd0b289556ff60204e61bbc0f39c0de503
 DIST ace-1.2.tar.gz 309289 RMD160 ee3b4c4707dba1eb92d06306157c1188bfba616d SHA1 c0bf8e4eaee3128b0f41e7832723a0660146278a SHA256 fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
 DIST ace-1.3.tar.gz 528916 RMD160 07772190956ebe2a0f78a613c40ab6e0221e0df4 SHA1 3b9b79e525c7e819e79a48c95fe2ad1bf2a33a49 SHA256 4fb6ca9e1ff34e42d9498f06e2bccaa61f5650daf48774015468d5f75c5347d3
 EBUILD ace-1.2-r2.ebuild 965 RMD160 f1018cb31c05ac4c00deb6d4f385955a23a15339 SHA1 713d7eab3a86de905dd6325740d166cd880961f8 SHA256 a845a7fa8f64523bbac1a80adae7a3dd4abc45d25cf7d1fc171e806f3bc9d99d
-EBUILD ace-1.3.ebuild 1024 RMD160 69618fd70140e0cdfcb34918aba0298242e1f01c SHA1 dc290677559b51f955a14c9a93d462cf3fb6cbae SHA256 d6a0e57535bb3215b58397060f41ce21c88008365ccc363cb96099e3a04f3391
-MISC ChangeLog 2537 RMD160 ef9471f87b6ba667e69fde203cc7be6b7335b8f4 SHA1 5d2cc19d1eb3dccd6142778494dab84e9d175066 SHA256 2dd7cdd073f28bdd071784d5da90e9e88ec5ab38bb9fd02915cf212b5bf183a9
+EBUILD ace-1.3.ebuild 1072 RMD160 8ba987019dde51f554c6971bd2e263a73ddf24dc SHA1 98e6f87904c35da04fba49b91ed7919ceb073535 SHA256 f5de8c0bd53e605a23ffbc7ae6a2ac8279ac1242d3a0d31aa2191bfdb6b5a86b
+MISC ChangeLog 2748 RMD160 f0d7096380fd4a942738bb89c83ff0088395af00 SHA1 f4261210101ca6982e2e47dfa7efc1c4ef8417a9 SHA256 81404e9c6b471f772ec0fd43c5057f28009b4af1e9c55327512d3854bc5ea41b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzW22QACgkQ9/cejkQaxBCz9QCfbOj/d402ebw8hM/1eRNM5oTe
+OmIAnR0fMJjq3ZeJmwtEQTpFyHrRz9ea
+=mZFm
+-----END PGP SIGNATURE-----
diff --git a/games-board/ace/ace-1.3.ebuild b/games-board/ace/ace-1.3.ebuild
index d52f861b1f53..bb77ca35b334 100644
--- a/games-board/ace/ace-1.3.ebuild
+++ b/games-board/ace/ace-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.3.ebuild,v 1.1 2010/09/29 22:07:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.3.ebuild,v 1.2 2010/11/07 17:00:58 hwoarang Exp $
 
 EAPI=2
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
@@ -20,7 +20,9 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-xpm.patch
+	epatch \
+		"${FILESDIR}"/${P}-no-xpm.patch \
+		"${FILESDIR}"/${P}-implicit-pointer.patch
 }
 
 src_configure() {
diff --git a/games-board/ace/files/ace-1.3-implicit-pointer.patch b/games-board/ace/files/ace-1.3-implicit-pointer.patch
new file mode 100644
index 000000000000..6a5ea42b705a
--- /dev/null
+++ b/games-board/ace/files/ace-1.3-implicit-pointer.patch
@@ -0,0 +1,14 @@
+Index: ace-1.3/games/spider.c
+===================================================================
+--- ace-1.3.orig/games/spider.c
++++ ace-1.3/games/spider.c
+@@ -20,8 +20,8 @@
+ #include <string.h>
+ #include <time.h>
+ 
++#include "imagelib.h"
+ #include "cards.h"
+-//#include "imagelib.h"
+ 
+ #define W CARD_WIDTH
+ #define H CARD_HEIGHT