From: Chris Gianelloni Date: Wed, 6 Sep 2006 20:36:47 +0000 (+0000) Subject: Updated gcc41 patch, added freelordsrc patch, and marking stable on ppc/x86. This... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc9fcda7bc418e21b1c7c1435ba002f67577131c;p=gentoo.git Updated gcc41 patch, added freelordsrc patch, and marking stable on ppc/x86. This is for bug #140707 and bug #133538. Package-Manager: portage-2.1.1_rc1-r1 --- diff --git a/games-strategy/freelords/ChangeLog b/games-strategy/freelords/ChangeLog index af791b741eb0..444f774596a7 100644 --- a/games-strategy/freelords/ChangeLog +++ b/games-strategy/freelords/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-strategy/freelords # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.22 2006/05/28 00:36:08 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.23 2006/09/06 20:36:47 wolf31o2 Exp $ + + 06 Sep 2006; Chris Gianelloni + +files/freelords-0.3.7-freelordsrc.patch, + files/freelords-0.3.7-gcc41.patch, freelords-0.3.7.ebuild: + Updated gcc41 patch, added freelordsrc patch, and marking stable on ppc/x86. + This is for bug #140707 and bug #133538. 28 May 2006; +files/freelords-0.3.7-gcc41.patch, freelords-0.3.7.ebuild: diff --git a/games-strategy/freelords/Manifest b/games-strategy/freelords/Manifest index 446f712f9fda..022785d2ca46 100644 --- a/games-strategy/freelords/Manifest +++ b/games-strategy/freelords/Manifest @@ -1,10 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX freelords-0.3.7-gcc41.patch 1678 RMD160 793813cf354111262161b4800946eb175b465caa SHA1 341b7f7e5382dc616e22cbffb320a7e2625199e1 SHA256 d6c4273bbef40bf3729ec0e67bd4dc79a9b3263ad63621d9bb81339efa023993 -MD5 203fdb0d6add8a978344968640d44a94 files/freelords-0.3.7-gcc41.patch 1678 -RMD160 793813cf354111262161b4800946eb175b465caa files/freelords-0.3.7-gcc41.patch 1678 -SHA256 d6c4273bbef40bf3729ec0e67bd4dc79a9b3263ad63621d9bb81339efa023993 files/freelords-0.3.7-gcc41.patch 1678 +AUX freelords-0.3.7-freelordsrc.patch 529 RMD160 69e1f7a5b7f28b101f163f2d06d4bf858bc94741 SHA1 31d5b3e895014a364e3da963a7cadd68a768f3e6 SHA256 464bcc09ed9994b2c133159485234f08bee11421733a5f9766483c28c65abfd8 +MD5 5f27731e7de32b29265b3679d9d3a508 files/freelords-0.3.7-freelordsrc.patch 529 +RMD160 69e1f7a5b7f28b101f163f2d06d4bf858bc94741 files/freelords-0.3.7-freelordsrc.patch 529 +SHA256 464bcc09ed9994b2c133159485234f08bee11421733a5f9766483c28c65abfd8 files/freelords-0.3.7-freelordsrc.patch 529 +AUX freelords-0.3.7-gcc41.patch 2607 RMD160 9da42fdf5be6cbe473abc53d219e2e261d7f0570 SHA1 7df83852c58ac1927f9ac00e531c99543139d2f2 SHA256 f2a4a1cf484d72c6948bcdf9a475661e6a196cd9152ba97db241ac1e3a7f9d2f +MD5 d2e119e2d570475ead39e9cc77bc5604 files/freelords-0.3.7-gcc41.patch 2607 +RMD160 9da42fdf5be6cbe473abc53d219e2e261d7f0570 files/freelords-0.3.7-gcc41.patch 2607 +SHA256 f2a4a1cf484d72c6948bcdf9a475661e6a196cd9152ba97db241ac1e3a7f9d2f files/freelords-0.3.7-gcc41.patch 2607 AUX freelordsrc 147 RMD160 280bd37b0f3513d369d23a6333f0fb29482f64a6 SHA1 4333410f0f00e25a0a45e25ac381e99354e6741f SHA256 08849f74f79358cbf2ff6fce51c5c7580f8d720694c97ece881ff9d9c1816cda MD5 ab1b855445f4e0f4ccbc46662e0bf206 files/freelordsrc 147 RMD160 280bd37b0f3513d369d23a6333f0fb29482f64a6 files/freelordsrc 147 @@ -20,14 +24,14 @@ EBUILD freelords-0.3.6.ebuild 1493 RMD160 f90c918e840f3e05cf9c1eb4c471d02e5921c7 MD5 d0d7d468935a8f28b20b76ad4cd5df38 freelords-0.3.6.ebuild 1493 RMD160 f90c918e840f3e05cf9c1eb4c471d02e5921c759 freelords-0.3.6.ebuild 1493 SHA256 ecc5b7e42fdb2c9634e3ad4d745317f0b4bb219d21d29316bb5dc63bd2cf6f40 freelords-0.3.6.ebuild 1493 -EBUILD freelords-0.3.7.ebuild 1761 RMD160 86fe7bb208c77cac544f36e1be052b5733d9ecec SHA1 66715553981554039010ac8d9a3c48083a409383 SHA256 744eb0d0fd7260e75b0dfeff5dcb5f65bb36061560b716e3688a1f65bf9ea065 -MD5 92e59f8b61f14ff785839df791b5c262 freelords-0.3.7.ebuild 1761 -RMD160 86fe7bb208c77cac544f36e1be052b5733d9ecec freelords-0.3.7.ebuild 1761 -SHA256 744eb0d0fd7260e75b0dfeff5dcb5f65bb36061560b716e3688a1f65bf9ea065 freelords-0.3.7.ebuild 1761 -MISC ChangeLog 2987 RMD160 66b0f09c3343131ed627e2547cb066dc4a1e8e7b SHA1 44a79b6e340f8ee62ef54f584e14352a441bed06 SHA256 45c1b2e4d3404606cb6f4d32d034f8dfab54bf07ec9c848df660ba104b918fee -MD5 0500acca26321ede6b8a10be3e66d5d5 ChangeLog 2987 -RMD160 66b0f09c3343131ed627e2547cb066dc4a1e8e7b ChangeLog 2987 -SHA256 45c1b2e4d3404606cb6f4d32d034f8dfab54bf07ec9c848df660ba104b918fee ChangeLog 2987 +EBUILD freelords-0.3.7.ebuild 1794 RMD160 7558f02c84aaff6642487acd910a7e8d4af9bbd0 SHA1 dd89712ec2acea53f55530be473728074d04b37e SHA256 f788e2c80a50c9fcd0117fd79988196932016385ee76d6da921f1fead0191364 +MD5 071f3e64b709f1b5fedb93bbf562fd94 freelords-0.3.7.ebuild 1794 +RMD160 7558f02c84aaff6642487acd910a7e8d4af9bbd0 freelords-0.3.7.ebuild 1794 +SHA256 f788e2c80a50c9fcd0117fd79988196932016385ee76d6da921f1fead0191364 freelords-0.3.7.ebuild 1794 +MISC ChangeLog 3271 RMD160 81a9fb90c2b2047ab7b926a76c94312e7b0bf9fe SHA1 a26277509f901db5622253c28bd1fda55081f71b SHA256 9ca877e3e0f4928ec4bfaa457c46cc38e7a7305581baa6fa9be639beb4ada25a +MD5 91294c1615a0246ac12f3e44ec87754b ChangeLog 3271 +RMD160 81a9fb90c2b2047ab7b926a76c94312e7b0bf9fe ChangeLog 3271 +SHA256 9ca877e3e0f4928ec4bfaa457c46cc38e7a7305581baa6fa9be639beb4ada25a ChangeLog 3271 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -42,9 +46,9 @@ MD5 e8a04c751e3fe7c570b4bb49852d2653 files/digest-freelords-0.3.7 253 RMD160 a7c12d9469089860ca2f3ec5b4c693ac584aa5d5 files/digest-freelords-0.3.7 253 SHA256 51350881c70d5bc40f40a19ab533cfcc7c20d3d17a417c865c297002796485f5 files/digest-freelords-0.3.7 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEePCF2CTtIKiFlQIRAomlAJ9+u4Emo8a2msNc7KboRrzp8BSbJwCfZYo1 -L3YNmLvANj8fTbjcgzSfRB8= -=uOt5 +iD8DBQFE/zF9kT4lNIS36YERAoWpAKC0uBymc57ufWYPXbpuOzKiHIWFaQCePUji +f/v638ODBVAzTgTbysyDZK4= +=hP0b -----END PGP SIGNATURE----- diff --git a/games-strategy/freelords/files/freelords-0.3.7-freelordsrc.patch b/games-strategy/freelords/files/freelords-0.3.7-freelordsrc.patch new file mode 100644 index 000000000000..b03e88ffee6c --- /dev/null +++ b/games-strategy/freelords/files/freelords-0.3.7-freelordsrc.patch @@ -0,0 +1,12 @@ +diff -N -u -r freelords-0.3.7-old/freelordsrc.in freelords-0.3.7/freelordsrc.in +--- freelords-0.3.7-old/freelordsrc.in 2006-05-16 23:21:48.709485176 +0200 ++++ freelords-0.3.7/freelordsrc.in 2006-05-16 23:22:10.712637169 +0200 +@@ -1,7 +1,7 @@ + + + @FREELORDS_DATADIR@ +- @HOME@/.freelords ++ + C + @SCREEN_RESOLUTION@ + @USE_FULLSCREEN@ diff --git a/games-strategy/freelords/files/freelords-0.3.7-gcc41.patch b/games-strategy/freelords/files/freelords-0.3.7-gcc41.patch index bc1f915974a6..4c58255efd1a 100644 --- a/games-strategy/freelords/files/freelords-0.3.7-gcc41.patch +++ b/games-strategy/freelords/files/freelords-0.3.7-gcc41.patch @@ -1,5 +1,6 @@ ---- src/ai_smart.h.old 2006-05-28 01:45:00.000000000 +0200 -+++ src/ai_smart.h 2006-05-28 01:45:14.000000000 +0200 +diff -N -u -r freelords-0.3.7-old/src/ai_smart.h freelords-0.3.7/src/ai_smart.h +--- freelords-0.3.7-old/src/ai_smart.h 2006-05-16 22:38:32.461522747 +0200 ++++ freelords-0.3.7/src/ai_smart.h 2006-05-16 22:42:53.180077999 +0200 @@ -106,7 +106,7 @@ Threat *getBiggestDangerTo(City *city, Threatlist *threats); @@ -9,8 +10,21 @@ }; #endif // AI_SMART_H ---- src/path.h.old 2006-05-28 01:41:44.000000000 +0200 -+++ src/path.h 2006-05-28 01:42:02.000000000 +0200 +diff -N -u -r freelords-0.3.7-old/src/OptionsDialog.cpp freelords-0.3.7/src/OptionsDialog.cpp +--- freelords-0.3.7-old/src/OptionsDialog.cpp 2006-05-16 22:38:32.921421416 +0200 ++++ freelords-0.3.7/src/OptionsDialog.cpp 2006-05-16 22:46:17.083151544 +0200 +@@ -245,7 +245,7 @@ + d_smooth_scrolling->Hide(); + d_show_next_player->Hide(); + +- unsigned int mode = (unsigned int)item->GetUserData(); ++ unsigned long mode = (unsigned long)item->GetUserData(); + + switch(mode) + { +diff -N -u -r freelords-0.3.7-old/src/path.h freelords-0.3.7/src/path.h +--- freelords-0.3.7-old/src/path.h 2006-05-16 22:38:32.465521866 +0200 ++++ freelords-0.3.7/src/path.h 2006-05-16 22:40:28.655921355 +0200 @@ -60,7 +60,7 @@ /* This function is used to verify if the stack can move on the Tile * of the given destination point @@ -20,8 +34,9 @@ /** Validates an existing path. * ---- src/scroller.h.old 2006-05-28 01:51:44.000000000 +0200 -+++ src/scroller.h 2006-05-28 01:51:56.000000000 +0200 +diff -N -u -r freelords-0.3.7-old/src/scroller.h freelords-0.3.7/src/scroller.h +--- freelords-0.3.7-old/src/scroller.h 2006-05-16 22:38:32.937417892 +0200 ++++ freelords-0.3.7/src/scroller.h 2006-05-16 22:44:24.244013663 +0200 @@ -39,7 +39,7 @@ void eventMouseLeave(); @@ -31,8 +46,9 @@ Uint32 d_timer; SmallMap * d_smap; ---- src/tooltip.h.old 2006-05-28 01:52:04.000000000 +0200 -+++ src/tooltip.h 2006-05-28 01:52:15.000000000 +0200 +diff -N -u -r freelords-0.3.7-old/src/tooltip.h freelords-0.3.7/src/tooltip.h +--- freelords-0.3.7-old/src/tooltip.h 2006-05-16 22:38:32.505513055 +0200 ++++ freelords-0.3.7/src/tooltip.h 2006-05-16 22:44:49.426465153 +0200 @@ -55,7 +55,7 @@ bool eventMouseMotion(const SDL_MouseMotionEvent* event); bool eventMouseButtonDown(const SDL_MouseButtonEvent* event); diff --git a/games-strategy/freelords/freelords-0.3.7.ebuild b/games-strategy/freelords/freelords-0.3.7.ebuild index 6b30053410e9..8560b671131f 100644 --- a/games-strategy/freelords/freelords-0.3.7.ebuild +++ b/games-strategy/freelords/freelords-0.3.7.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.7.ebuild,v 1.5 2006/05/28 00:36:08 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.7.ebuild,v 1.6 2006/09/06 20:36:47 wolf31o2 Exp $ inherit eutils games DESCRIPTION="Free Warlords clone" -HOMEPAGE="http://freelords.sourceforge.net/" +HOMEPAGE="http://www.freelords.org/" SRC_URI="mirror://sourceforge/freelords/${P}.tar.bz2" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ppc x86" LICENSE="GPL-2" SLOT="0" IUSE="editor nls" @@ -35,7 +35,6 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}"-gcc41.patch sed -i \ -e "s:\"freelordsrc\":\"${GAMES_SYSCONFDIR}/freelordsrc\":" \ src/main.cpp \ @@ -44,6 +43,8 @@ src_unpack() { -e '/^localedir/ s:$(datadir):/usr/share:' \ -e 's:$(prefix)/share/locale:/usr/share/locale:' src/Makefile.in \ || die "sed src/Makefile.in failed" + epatch ${FILESDIR}/${P}-gcc41.patch + epatch ${FILESDIR}/${P}-freelordsrc.patch } src_compile() {