diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2006-04-25 21:18:45 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2006-04-25 21:18:45 +0000 |
commit | 5d187ddf5c0d95e8a31e056163fa3bc420c4d7da (patch) | |
tree | 8da549b562c72dfe2f9da6355a82a463430ecc76 /games-board/ace | |
parent | Version bump, thanks to James in bug #129521 (diff) | |
download | historical-5d187ddf5c0d95e8a31e056163fa3bc420c4d7da.tar.gz historical-5d187ddf5c0d95e8a31e056163fa3bc420c4d7da.tar.bz2 historical-5d187ddf5c0d95e8a31e056163fa3bc420c4d7da.zip |
Fix for gcc-4.1
Package-Manager: portage-2.1_pre9-r4
Diffstat (limited to 'games-board/ace')
-rw-r--r-- | games-board/ace/ChangeLog | 8 | ||||
-rw-r--r-- | games-board/ace/Manifest | 25 | ||||
-rw-r--r-- | games-board/ace/ace-1.2-r1.ebuild | 7 | ||||
-rw-r--r-- | games-board/ace/files/ace-1.2-gcc41.patch | 73 | ||||
-rw-r--r-- | games-board/ace/files/digest-ace-1.2-r1 | 2 |
5 files changed, 107 insertions, 8 deletions
diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog index f12ef0704892..12fb37576f6c 100644 --- a/games-board/ace/ChangeLog +++ b/games-board/ace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/ace -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.12 2005/12/14 04:10:01 spyderous Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.13 2006/04/25 21:18:45 tupone Exp $ + + 25 Apr 2006; <Tupone@gentoo.org> +files/ace-1.2-gcc41.patch, + ace-1.2-r1.ebuild: + fix for gcc-4.1 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; ace-1.2-r1.ebuild: Add modular X dependencies. diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest index dfc80f8c4d2c..7733200a4697 100644 --- a/games-board/ace/Manifest +++ b/games-board/ace/Manifest @@ -1,5 +1,24 @@ -MD5 272c49dc5dee1257353275fc6c3d9eb6 ChangeLog 1569 -MD5 011ec145584b07ef4d9eade0b762a2bf ace-1.2-r1.ebuild 874 +AUX ace-1.2-check_for_end_of_game.patch 262 RMD160 f39618a843461e4e8f1d139b87e808b163f071d1 SHA1 c4d7d9b32f0de8882a2b9c59c0873497c7194586 SHA256 16c841454ac9c3552b4aa70c3ec3bafbb8db33fb1e2a85e0f36de1623e09179e size 262 MD5 1dbc44808235a583afa1158ba19cb5a6 files/ace-1.2-check_for_end_of_game.patch 262 -MD5 0db35cac674353398197d9ae9feb9fc3 files/digest-ace-1.2-r1 59 +RMD160 f39618a843461e4e8f1d139b87e808b163f071d1 files/ace-1.2-check_for_end_of_game.patch 262 +SHA256 16c841454ac9c3552b4aa70c3ec3bafbb8db33fb1e2a85e0f36de1623e09179e files/ace-1.2-check_for_end_of_game.patch 262 +AUX ace-1.2-gcc41.patch 2020 RMD160 c4b54b0a725508ab25c22ec633beb23b1a7035a5 SHA1 cc83372eb43277d83734dd38aa0286a135d618bd SHA256 45362fb9c87496fe6c0b84502d8e4a37ba37a8d4c389b749a1ef9920a2e85d60 size 2020 +MD5 1c026702258fd964e05176934ce40faa files/ace-1.2-gcc41.patch 2020 +RMD160 c4b54b0a725508ab25c22ec633beb23b1a7035a5 files/ace-1.2-gcc41.patch 2020 +SHA256 45362fb9c87496fe6c0b84502d8e4a37ba37a8d4c389b749a1ef9920a2e85d60 files/ace-1.2-gcc41.patch 2020 +DIST ace-1.2.tar.gz 309289 RMD160 ee3b4c4707dba1eb92d06306157c1188bfba616d SHA256 fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d size 309289 +EBUILD ace-1.2-r1.ebuild 903 RMD160 cfafe3f4179632cadd15841809da2040dd1487b0 SHA1 ab4f35ed0cdf327953a82f3145dc5474605699a3 SHA256 fa17a0c80625ce63a870a63343e94482081f169c7590f967c5f632dc3afc987b size 903 +MD5 40e3a898d085c65555efa5b2167268b9 ace-1.2-r1.ebuild 903 +RMD160 cfafe3f4179632cadd15841809da2040dd1487b0 ace-1.2-r1.ebuild 903 +SHA256 fa17a0c80625ce63a870a63343e94482081f169c7590f967c5f632dc3afc987b ace-1.2-r1.ebuild 903 +MISC ChangeLog 1669 RMD160 f7197ef17367fecdec1e79d73b3107a6a0033348 SHA1 d3f01fa60c8aa8577105e3dbd6198fa3f0726515 SHA256 a7c67c5e6823e3a033d95bec87d44f70b6d911372fde071a7383f6ef6356a01c size 1669 +MD5 ad50975aa7c86a68add899a7bb6cc49b ChangeLog 1669 +RMD160 f7197ef17367fecdec1e79d73b3107a6a0033348 ChangeLog 1669 +SHA256 a7c67c5e6823e3a033d95bec87d44f70b6d911372fde071a7383f6ef6356a01c ChangeLog 1669 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 +RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 +SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 +MD5 0a155fa22b0e899cfa547a0a4f9bb1dd files/digest-ace-1.2-r1 223 +RMD160 46d8a92e87e3315634b204dcefa6048fe97c3ab6 files/digest-ace-1.2-r1 223 +SHA256 23a6708f7879df16da14cdf8a5f8e19808558e584edc276bf596af714445f2bd files/digest-ace-1.2-r1 223 diff --git a/games-board/ace/ace-1.2-r1.ebuild b/games-board/ace/ace-1.2-r1.ebuild index ef4bedcfa924..f9cf3a81966c 100644 --- a/games-board/ace/ace-1.2-r1.ebuild +++ b/games-board/ace/ace-1.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 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.15 2005/12/14 04:10:01 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.16 2006/04/25 21:18:45 tupone Exp $ inherit eutils games @@ -20,7 +20,8 @@ DEPEND="|| ( x11-libs/libXpm virtual/x11 ) src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/ace-1.2-check_for_end_of_game.patch + epatch "${FILESDIR}/${P}"-check_for_end_of_game.patch \ + "${FILESDIR}/${P}"-gcc41.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-gcc41.patch b/games-board/ace/files/ace-1.2-gcc41.patch new file mode 100644 index 000000000000..7d41b67ae067 --- /dev/null +++ b/games-board/ace/files/ace-1.2-gcc41.patch @@ -0,0 +1,73 @@ +--- games/golf.c.old 2006-04-25 22:22:15.000000000 +0200 ++++ games/golf.c 2006-04-25 22:25:51.000000000 +0200 +@@ -31,7 +31,7 @@ + + Stack *deck, *discard, *stacks[7]; + +-static int table_width, table_height; ++static int _table_width, _table_height; + + int supress_arrows = 0; + +@@ -42,10 +42,10 @@ + { + int alt_width = 3*M+2*W+51*R; + init_ace(argc, argv); +- table_width = 8*M+7*W; +- if (table_width < alt_width) table_width = alt_width; +- table_height = 3*M+5*CARD_FAN_DOWN+2*H; +- init_table(table_width, table_height); ++ _table_width = 8*M+7*W; ++ if (_table_width < alt_width) _table_width = alt_width; ++ _table_height = 3*M+5*CARD_FAN_DOWN+2*H; ++ init_table(_table_width, _table_height); + table_loop(); + } + +@@ -118,7 +118,7 @@ + sprintf(s, "%2d", c); + else + strcpy(s, " "); +- text(s, M*2, table_height-M-H-2); ++ text(s, M*2, _table_height-M-H-2); + } + + void +@@ -152,9 +152,9 @@ + { + int s, v; + +- arrow_offset = (table_width - 7 * W) / 8; ++ arrow_offset = (_table_width - 7 * W) / 8; + arrow_delta = arrow_offset + W; +- arrow_offset = (table_width - 7*W - 6*arrow_offset)/2; ++ arrow_offset = (_table_width - 7*W - 6*arrow_offset)/2; + + stack_load_standard_deck(); + splash = get_picture("golf"); +@@ -171,8 +171,8 @@ + stack_set_offset(stacks[s], STACK_OFFSET_DOWN); + } + +- deck = stack_create(M, table_height-M-H); +- discard = stack_create(M*2+W, table_height-M-H); ++ deck = stack_create(M, _table_height-M-H); ++ discard = stack_create(M*2+W, _table_height-M-H); + stack_set_offset(discard, STACK_OFFSET_TBRIGHT); + + for (s=0; s<4; s++) +@@ -228,10 +228,10 @@ + Picture *cp = get_centered_pic(); + + if ((cp == youlose || cp == youwin) +- && (x > table_width/2-cp->w/2 +- && x < table_width/2+cp->w/2 +- && y > table_height/2-cp->h/2 +- && y < table_height/2+cp->h/2)) ++ && (x > _table_width/2-cp->w/2 ++ && x < _table_width/2+cp->w/2 ++ && y > _table_height/2-cp->h/2 ++ && y < _table_height/2+cp->h/2)) + { + set_centered_pic(0); + start_again(); diff --git a/games-board/ace/files/digest-ace-1.2-r1 b/games-board/ace/files/digest-ace-1.2-r1 index 960427efba6c..dd0d57470b27 100644 --- a/games-board/ace/files/digest-ace-1.2-r1 +++ b/games-board/ace/files/digest-ace-1.2-r1 @@ -1 +1,3 @@ MD5 03e5e7ab8ac3acc59661c6e9c09089b7 ace-1.2.tar.gz 309289 +RMD160 ee3b4c4707dba1eb92d06306157c1188bfba616d ace-1.2.tar.gz 309289 +SHA256 fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d ace-1.2.tar.gz 309289 |