Fix for gcc-4.1

Package-Manager: portage-2.1_rc2-r3

4 files changed, 130 insertions, 17 deletions

diff --git a/games-strategy/freecraft/ChangeLog b/games-strategy/freecraft/ChangeLog
index 6dc7d8c011d9..43b6d0316fa7 100644
--- a/games-strategy/freecraft/ChangeLog
+++ b/games-strategy/freecraft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecraft
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.11 2005/09/26 18:24:21 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.12 2006/05/27 11:17:52 tupone Exp $
+
+  27 May 2006; <Tupone@gentoo.org> +files/freecraft-1.18-gcc41.patch,
+  freecraft-1.18-r3.ebuild:
+  Fix for gcc-4.1
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   freecraft-1.18-r3.ebuild:
diff --git a/games-strategy/freecraft/Manifest b/games-strategy/freecraft/Manifest
index 052fe6477aab..7a19315c8876 100644
--- a/games-strategy/freecraft/Manifest
+++ b/games-strategy/freecraft/Manifest
@@ -1,24 +1,38 @@
-AUX 1.18-setup.patch 1057 RMD160 90f5b5352fe6150ad944ac1ec601be81d605853c SHA1 cd2f754ff0d928c838b950418f8210654ffa5dc9 SHA256 524cc950b93c4c674e2d37f8a41bd7dfaf48f80c86bd339196350552c153c6fe size 1057
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.18-setup.patch 1057 RMD160 90f5b5352fe6150ad944ac1ec601be81d605853c SHA1 cd2f754ff0d928c838b950418f8210654ffa5dc9 SHA256 524cc950b93c4c674e2d37f8a41bd7dfaf48f80c86bd339196350552c153c6fe
 MD5 c7be4012a9ba721244dec67d4abc2e53 files/1.18-setup.patch 1057
 RMD160 90f5b5352fe6150ad944ac1ec601be81d605853c files/1.18-setup.patch 1057
 SHA256 524cc950b93c4c674e2d37f8a41bd7dfaf48f80c86bd339196350552c153c6fe files/1.18-setup.patch 1057
-AUX freecraft 493 RMD160 af4d83c1f1a8bd436c73a2fb5905d6693d7cafd5 SHA1 22e539e97c0e4ee2d70f04032b1ee63e705c1916 SHA256 a34fe93b034bd82e5430a466c19bb3d32b7601cc9da4c2b09fcbdf0b0a8d181d size 493
+AUX freecraft 493 RMD160 af4d83c1f1a8bd436c73a2fb5905d6693d7cafd5 SHA1 22e539e97c0e4ee2d70f04032b1ee63e705c1916 SHA256 a34fe93b034bd82e5430a466c19bb3d32b7601cc9da4c2b09fcbdf0b0a8d181d
 MD5 0e6f6ecc763f6ca1565717fa90296b45 files/freecraft 493
 RMD160 af4d83c1f1a8bd436c73a2fb5905d6693d7cafd5 files/freecraft 493
 SHA256 a34fe93b034bd82e5430a466c19bb3d32b7601cc9da4c2b09fcbdf0b0a8d181d files/freecraft 493
-DIST freecraft-030311-src.tar.gz 1883435 RMD160 6f35070a8c9f953d1fffdc673219d8ab7ccaba6f SHA256 1728b6249a2618ccad0fbb4b2fa06c479eab5294017b397cbfd245ff9dbd0c19 size 1883435
-EBUILD freecraft-1.18-r3.ebuild 2644 RMD160 acdc557422d14e4e01ed01f55ce499d5844e7737 SHA1 e8e98bf6d1f42db92a4d12135344e5e145811eef SHA256 5944e5bd42a1e38b7ed08bc10ee799537dd1cb1c59a240206b28114377ec8ae8 size 2644
-MD5 b698d07c8842fc88e7694494e619ec8f freecraft-1.18-r3.ebuild 2644
-RMD160 acdc557422d14e4e01ed01f55ce499d5844e7737 freecraft-1.18-r3.ebuild 2644
-SHA256 5944e5bd42a1e38b7ed08bc10ee799537dd1cb1c59a240206b28114377ec8ae8 freecraft-1.18-r3.ebuild 2644
-MISC ChangeLog 2416 RMD160 dd307d3e8fd4ce807abf1967cd0d38bfdab9fc4e SHA1 27c887a3c905aab40804fd6a5dc32b75c97491df SHA256 109c61a21d731489f90b77571f81b16cf38e792ef0e6a387d9ad5bb734937ad6 size 2416
-MD5 d592e190b94274119dfc7be395cc9cc9 ChangeLog 2416
-RMD160 dd307d3e8fd4ce807abf1967cd0d38bfdab9fc4e ChangeLog 2416
-SHA256 109c61a21d731489f90b77571f81b16cf38e792ef0e6a387d9ad5bb734937ad6 ChangeLog 2416
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+AUX freecraft-1.18-gcc41.patch 2816 RMD160 eac34a4203bc0682022fd795fbab3211f3fc6ddd SHA1 ceae0144b8509bb1b3d290d5f4ee807a8d5b7cf1 SHA256 5008fe57339babba5421ed8a454fc18b0f32c4d4e372287563cf4049dded717f
+MD5 a58042c2d290371950eba4fcd99ad0ec files/freecraft-1.18-gcc41.patch 2816
+RMD160 eac34a4203bc0682022fd795fbab3211f3fc6ddd files/freecraft-1.18-gcc41.patch 2816
+SHA256 5008fe57339babba5421ed8a454fc18b0f32c4d4e372287563cf4049dded717f files/freecraft-1.18-gcc41.patch 2816
+DIST freecraft-030311-src.tar.gz 1883435 RMD160 6f35070a8c9f953d1fffdc673219d8ab7ccaba6f SHA1 4104b720e717b89111b7e301fa1bcbd54ae8aefc SHA256 1728b6249a2618ccad0fbb4b2fa06c479eab5294017b397cbfd245ff9dbd0c19
+EBUILD freecraft-1.18-r3.ebuild 2676 RMD160 ca2a4e65e693bcde6433e078581aee8b2e2ad802 SHA1 ca8f3570f43a7289d94cd0f1748643bea4d88edf SHA256 3fd9930091823e75b00a1ea567a3f60eafdb2bf18362aaf3a711287c51ae1f11
+MD5 c4a58a46e9156293ee1254f29bb1867a freecraft-1.18-r3.ebuild 2676
+RMD160 ca2a4e65e693bcde6433e078581aee8b2e2ad802 freecraft-1.18-r3.ebuild 2676
+SHA256 3fd9930091823e75b00a1ea567a3f60eafdb2bf18362aaf3a711287c51ae1f11 freecraft-1.18-r3.ebuild 2676
+MISC ChangeLog 2531 RMD160 56ba13ccd341f5ab7bd688487c898d44a18b0142 SHA1 1dccd99c6a69013fc95e60ef90f71b6905141454 SHA256 abcf3875f04b4b65b1bb7ab946c013233c1630878db1be9998e7d2cedcd83edc
+MD5 6a7ec6655ab2a80ab99d872702bdfada ChangeLog 2531
+RMD160 56ba13ccd341f5ab7bd688487c898d44a18b0142 ChangeLog 2531
+SHA256 abcf3875f04b4b65b1bb7ab946c013233c1630878db1be9998e7d2cedcd83edc ChangeLog 2531
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 654d2fd7b68e87cd7a861d31c68f54aa files/digest-freecraft-1.18-r3 265
 RMD160 6838485b92571f3ae97ba3c40c0fcc3e8b10470f files/digest-freecraft-1.18-r3 265
 SHA256 4637a2d97f43044b7385627c51288a2bd91f451f9c212c96441cf07da3be4275 files/digest-freecraft-1.18-r3 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEeDVs2CTtIKiFlQIRAlI+AJ9HJEamYPJRBdoD0wm7062rjvstBACeIqmB
+XNeAsvS42i5l3Qk4GHagzbo=
+=I/GT
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freecraft/files/freecraft-1.18-gcc41.patch b/games-strategy/freecraft/files/freecraft-1.18-gcc41.patch
new file mode 100644
index 000000000000..b7cb4a7eaf0a
--- /dev/null
+++ b/games-strategy/freecraft/files/freecraft-1.18-gcc41.patch
@@ -0,0 +1,94 @@
+--- src/clone/mpq.c.old	2006-05-27 12:13:54.000000000 +0200
++++ src/clone/mpq.c	2006-05-27 12:16:51.000000000 +0200
+@@ -106,9 +106,9 @@
+ extern const unsigned char dcl_table[];
+ local UInt8 *explode_buffer;
+ 
+-extern const UInt8 wav_table[2512];
+-extern const UInt32 small_tbl1[90];
+-extern const UInt32 small_tbl2[32];
++local const UInt8 wav_table[2512];
++local const UInt32 small_tbl1[90];
++local const UInt32 small_tbl2[32];
+ 
+ local UInt32 offset_mpq;		/// Offset to MPQ file data
+ local UInt32 offset_htbl;		/// Offset to hash_table of MPQ
+--- src/clone/scm.c.old	2006-05-27 12:17:38.000000000 +0200
++++ src/clone/scm.c	2006-05-27 12:37:29.000000000 +0200
+@@ -165,7 +165,9 @@
+ */
+ local inline int ChkReadByte(void)
+ {
+-    return *((unsigned char*)chk_ptr)++;
++    int r = *(unsigned char *)chk_ptr;
++    chk_ptr = ((unsigned char *)chk_ptr) + 1;
++    return r;
+ }
+ 
+ /**
+--- src/unit/unittype.c.old	2006-05-27 12:28:11.000000000 +0200
++++ src/unit/unittype.c	2006-05-27 12:46:31.000000000 +0200
+@@ -266,7 +266,7 @@
+ }
+ 
+     /// Macro to fetch an 8bit value, to have some looking 8/16/32 bit funcs.
+-#define Fetch8(p)   (*((unsigned char*)(p))++)
++#define Fetch8(p)   (*((unsigned char*)(p))); p = ((unsigned char*)(p)) + 1
+ 
+ /**
+ **	Parse UDTA area from puds.
+--- src/video/linedraw.c.old	2006-05-27 12:46:57.000000000 +0200
++++ src/video/linedraw.c	2006-05-27 12:47:56.000000000 +0200
+@@ -1432,7 +1432,8 @@
+     f=((unsigned long)Pixels16[color]<<16)|Pixels16[color];
+ 
+     while( p<e ) {			// draw 2 pixels
+-	*((unsigned long*)p)++=f;
++	*((unsigned long*)p)=f;
++	p=((unsigned long*)p)+1;
+     }
+ 
+     if( p<=e ) {
+--- src/include/myendian.h.old	2006-05-27 12:29:53.000000000 +0200
++++ src/include/myendian.h	2006-05-27 12:45:29.000000000 +0200
+@@ -85,8 +85,6 @@
+ **	Fetch a 16 bit value in little endian with incrementing pointer
+ **	and return it in native format.
+ */
+-#ifdef __ULTRA_SPARC__
+-
+ extern unsigned short inline _FetchLE16(unsigned char **pp) {
+     unsigned char *p = *pp;
+     unsigned short i = p[0] + (p[1] << 8);
+@@ -95,18 +93,10 @@
+ }
+ #define FetchLE16(p)    _FetchLE16(&p)
+ 
+-#else
+-
+-#define	FetchLE16(p)	SDL_SwapLE16(*((unsigned short*)(p))++)
+-
+-#endif
+-
+ /**
+ **	Fetch a 32 bit value in little endian with incrementing pointer
+ **	and return it in native format.
+ */
+-#ifdef __ULTRA_SPARC__
+-
+ extern unsigned inline _FetchLE32(unsigned char **pp) {
+     unsigned char *p = *pp;
+     unsigned int i = p[0] + (p[1] << 8) + (p[2] << 16) + (p[3] <<24);
+@@ -115,12 +105,6 @@
+ }
+ #define FetchLE32(p)    _FetchLE32(&p)
+ 
+-#else
+-
+-#define	FetchLE32(p)	SDL_SwapLE32(*((unsigned int*)(p))++)
+-
+-#endif
+-
+ // ============================================================================
+ #else		// }{ SDL
+ // ============================================================================
diff --git a/games-strategy/freecraft/freecraft-1.18-r3.ebuild b/games-strategy/freecraft/freecraft-1.18-r3.ebuild
index c4cc84141382..c3f603892e6c 100644
--- a/games-strategy/freecraft/freecraft-1.18-r3.ebuild
+++ b/games-strategy/freecraft/freecraft-1.18-r3.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-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.10 2006/05/03 07:28:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.11 2006/05/27 11:17:52 tupone Exp $
 
 inherit eutils games
 
@@ -32,7 +32,8 @@ pkg_nofetch() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-setup.patch"
+	epatch "${FILESDIR}/${PV}-setup.patch" \
+		"${FILESDIR}/${P}"-gcc41.patch
 	env GENTOO_CFLAGS="${CFLAGS}" ./setup || die
 }