Patch by Mark Loeser <halcy0n@gentoo.org> allows compilation in GCC 4.0/4.1 to complete. Closes bug #122290. Unfortunately portability is not improved.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 118 insertions, 4 deletions

diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog
index 733c73f6c846..1e65e3a7e130 100644
--- a/games-fps/duke3d/ChangeLog
+++ b/games-fps/duke3d/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/duke3d
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.21 2006/01/28 23:09:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.22 2006/03/05 13:40:16 chainsaw Exp $
+
+  05 Mar 2006; Tony Vroon <chainsaw@gentoo.org> +files/20040817-gcc4.patch,
+  duke3d-20040817.ebuild:
+  Patch by Mark Loeser <halcy0n@gentoo.org> allows compilation on GCC 4.0/4.1
+  to complete. Closes bug #122290. Unfortunately portability is not improved.
 
   28 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org>
   duke3d-20040817.ebuild:
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index af3b1885bdeb..433e5b9c81ef 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -1,10 +1,43 @@
-MD5 29cea1306535cb44ef36382c113463d8 ChangeLog 3042
-MD5 770956c38cc8a3118c59ad68983f3ed3 duke3d-20040817.ebuild 2952
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a4f8d1608ba94568c28f6428ed1a7c35 ChangeLog 3300
+RMD160 899ab04c0323949c9f728ac471517387dfc1b44c ChangeLog 3300
+SHA256 41979212b0806dc1431fbfe23719681c024b498d4f860a73e83816cc8002b9f7 ChangeLog 3300
+MD5 d78830037e4b81a6c28ec4286e676e6d duke3d-20040817.ebuild 3037
+RMD160 2c867d2f2c6a57153af296f06e0c1657c4397a6a duke3d-20040817.ebuild 3037
+SHA256 daa06aface3df77e032a9acf5ee54d09ebc4fc2c0c1d212be8718f807fb33c4f duke3d-20040817.ebuild 3037
 MD5 6ba6bae3aa96076fbb7dc72e06d93d3d files/20040817-credits.patch 1267
+RMD160 bef48612e6e7176e1f7a252bfd837f177814e80b files/20040817-credits.patch 1267
+SHA256 ea4d7540790ea937d97d5e87abdfa893e58b699fcb16abb30e84529edce061a9 files/20040817-credits.patch 1267
 MD5 50643150138fd99d9cfb2ed68df15e7d files/20040817-duke3d-makefile-opts.patch 863
+RMD160 49c36fb8f5907f9ac01fd2d9e4a5c192b7ba5fdf files/20040817-duke3d-makefile-opts.patch 863
+SHA256 afcc1bfc4e3977dbe02b1f390d184b00d8773b1690dce10f4728c535b9c69d56 files/20040817-duke3d-makefile-opts.patch 863
 MD5 8832de2aa57847fefffa6b1f0695603f files/20040817-endian.patch 772
+RMD160 b5657806a89846a9280b7ece2aa95b7816249e8b files/20040817-endian.patch 772
+SHA256 e0bd07c16123593627e888c102a84af033e906ace3aa3a1559828d83626ec16e files/20040817-endian.patch 772
 MD5 b5f62f5d9c612de0355e3ca3db6c5875 files/20040817-gcc34.patch 1886
+RMD160 971968bf75c8151269ee3ca6a326ca780e2470ad files/20040817-gcc34.patch 1886
+SHA256 f6f8271c95d898317b17eb22986a90294db4297482b011b01bf659c22686a3d8 files/20040817-gcc34.patch 1886
+MD5 6821e11d3e0ef90e2b6efe94467b64a9 files/20040817-gcc4.patch 2169
+RMD160 641c45992c2c26447543b9c2175673e9588b71ef files/20040817-gcc4.patch 2169
+SHA256 aef2b2b12a04a69ed075df55aae1f8a40d9c4fb9c5abd62f66119da3357c540a files/20040817-gcc4.patch 2169
 MD5 7c796eee05f2a392dd0449339bc37804 files/digest-duke3d-20040817 69
+RMD160 925748ca19a62848686bf65ff97edb978b7218f7 files/digest-duke3d-20040817 69
+SHA256 8945577d18fde21fe49f8694b72acda313a0378f6031d5c7ac4d921af884ab77 files/digest-duke3d-20040817 69
 MD5 ccf71074bb15e3a511194a887a3a7040 files/duke3d.cfg 4314
+RMD160 8ba6360d6bc24ae353a8c3ad0b973c47d379ea21 files/duke3d.cfg 4314
+SHA256 0ad9477e6185f0d812d726943beacdc7f7581f66c86640f44ee8e5621fe40556 files/duke3d.cfg 4314
 MD5 d9b4e6eca1f10d7502ce7c8b360ba16b files/network.cfg 398
+RMD160 4452e8b8a99f0e08b192f2418ff8324c4bce8a7e files/network.cfg 398
+SHA256 fe5806712207d39812906034b76191effc96d7c6efa9c8bd9081e18fab76d7b5 files/network.cfg 398
 MD5 3a1f336e4cfd9b74bc9bacb21ea0b300 metadata.xml 2684
+RMD160 eed72413b7f7c435e230bf792c5c197a963a7f82 metadata.xml 2684
+SHA256 95fd87b844c798dbc6f63c25480e1d5e2aed7c0a9c32943e688602e0cbac8097 metadata.xml 2684
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFECuqkp5vW4rUFj5oRAl57AJ0c+Fdnq6au2ivjEWo6pz+janonHACfXv3m
+X+0pVzG8FAunlI4MWqr7v/w=
+=T2LA
+-----END PGP SIGNATURE-----
diff --git a/games-fps/duke3d/duke3d-20040817.ebuild b/games-fps/duke3d/duke3d-20040817.ebuild
index edd8c4916d24..f34b77162c9c 100644
--- a/games-fps/duke3d/duke3d-20040817.ebuild
+++ b/games-fps/duke3d/duke3d-20040817.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.7 2006/01/28 23:09:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.8 2006/03/05 13:40:16 chainsaw Exp $
 
 fromcvs=0
 ECVS_MODULE="duke3d"
@@ -62,6 +62,7 @@ src_unpack() {
 	# need to sync features with build engine
 	epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch"
 	epatch "${FILESDIR}/${PV}-gcc34.patch" # compile fixes for GCC 3.4
+	epatch "${FILESDIR}/${PV}-gcc4.patch" # compile fixes for GCC 4.0/4.1 by Mark Loeser
 	sed -i \
 		-e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \
 		-e "/^use_physfs := / s:=.*:= false:" \
diff --git a/games-fps/duke3d/files/20040817-gcc4.patch b/games-fps/duke3d/files/20040817-gcc4.patch
new file mode 100644
index 000000000000..d79dda96c35b
--- /dev/null
+++ b/games-fps/duke3d/files/20040817-gcc4.patch
@@ -0,0 +1,75 @@
+iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c
+--- duke3d/source/buildengine/a.c	2004-11-25 13:55:21.000000000 -0500
++++ duke3d-gcc4/source/buildengine/a.c	2005-06-18 18:14:24.000000000 -0400
+@@ -186,7 +186,9 @@
+     if (i3 == 0)
+     {
+ 	    i1 += i4;
+-	    ((unsigned long)i4) >>= mach3_al;
++			unsigned long temp = i4;
++	    temp >>= mach3_al;
++			i4 = temp;
+ 	    i4 = (i4&0xffffff00) | (source[i4]&0xff);
+ 	    *dest = ((unsigned char*)i2)[i4];
+ 	    return i1;
+diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/pragmas.c
+--- duke3d/source/buildengine/pragmas.c	2003-07-25 20:11:32.000000000 -0400
++++ duke3d-gcc4/source/buildengine/pragmas.c	2005-06-18 18:25:37.000000000 -0400
+@@ -56,28 +56,39 @@
+ 
+ void clearbufbyte(void *buffer, int size, long fill_value) {
+   int lsize;
++	unsigned char *p=buffer;
++	unsigned short *s=buffer;
+   switch(size){
+   case 0: return;
+-  case 1: *((unsigned char*)buffer)++ = fill_value; return;
+-  case 2: *((unsigned short*)buffer)++ = fill_value; return;
+-  case 3: { unsigned char *p=buffer; p[2]=p[1]=p[0] = fill_value;} return;
++  case 1: ++p; *p = fill_value; return;
++  case 2: ++s; *s = fill_value; return;
++  case 3: { p[2]=p[1]=p[0] = fill_value;} return;
+   default:
+ 	if ((int)buffer&1) {
+-		*((unsigned char*)buffer)++ = fill_value; size--;
++		++p; *p = fill_value; size--;
++		buffer = p;
+ 	}
+ 	if ((int)buffer&2) {
+-		*((unsigned short*)buffer)++ = fill_value; size-=2;
++		++s; *s = fill_value; size-=2;
++		buffer = s;
+ 	}
+ 	lsize = size>>2;
++	unsigned int *up = buffer;
+ 	while(lsize) {
+-		*((unsigned int*)buffer)++ = fill_value;
++		++up;
++		*up = fill_value;
+ 		lsize--;
+ 	}
++	buffer = up;
+ 	if (size&2) {
+-		*((unsigned short*)buffer)++ = fill_value;
++		s = buffer;
++		++s;
++		*s = fill_value;
+ 	}
+ 	if (size&1) {
+-		*((unsigned char*)buffer)++ = fill_value;
++		p = buffer;
++		++p;
++		*p = fill_value;
+ 	}
+   }
+ }
+@@ -122,7 +133,7 @@
+ 	{
+ 		*((unsigned short *)source) = ((linum>>16)&0xffff);
+ 		linum += linum_inc;
+-		((unsigned char*)source) = ((unsigned char*)source) + 2;
++		source = ((unsigned char*)source) + 2;
+ 		size--;
+ 		if (size == 0) return;
+ 	}
+