Fix GCC 3.4 compilation (moving functions to before their calling statements). No revbump.

4 files changed, 97 insertions, 19 deletions

diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog
index bd49f2a09073..ba8c9a6b4a8b 100644
--- a/games-fps/duke3d/ChangeLog
+++ b/games-fps/duke3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/duke3d
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.15 2004/08/18 04:08:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.16 2004/08/22 14:06:25 chainsaw Exp $
+
+  22 Aug 2004; Tony Vroon <chainsaw@gentoo.org> +files/20040817-gcc34.patch,
+  duke3d-20040817.ebuild:
+  Fix compilation on GCC 3.4
 
 *duke3d-20040817 (18 Aug 2004)
 
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index 2a4d71d678f3..23fff0832ab3 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 028e37e7e82d18a9e6153c7e8904f68b ChangeLog 2250
 MD5 4f8ea93527f1b7723438a4d1a207030b duke3d-20030817-r1.ebuild 2783
+MD5 3b399b34888293bf17d407e126c84369 ChangeLog 2383
+MD5 a0e9ef221ecd76e2196627e5f2b569e3 duke3d-20040817.ebuild 2800
 MD5 3a1f336e4cfd9b74bc9bacb21ea0b300 metadata.xml 2684
-MD5 95a1be21fd5a473fa8d93d40b662e06d duke3d-20040817.ebuild 2732
-MD5 f61d663b18e338844d9bdab8cd8a113d files/20030817-buildengine-makefile-cflags.patch 523
+MD5 d9b4e6eca1f10d7502ce7c8b360ba16b files/network.cfg 398
+MD5 b5f62f5d9c612de0355e3ca3db6c5875 files/20040817-gcc34.patch 1886
+MD5 6ba6bae3aa96076fbb7dc72e06d93d3d files/20040817-credits.patch 1267
 MD5 7c4ac6336d128a410fc4fb603ad8b8c7 files/20030817-duke3d-makefile-opts.patch 864
-MD5 73621a8c90765f4722208283a01319f7 files/digest-duke3d-20030817-r1 66
+MD5 f61d663b18e338844d9bdab8cd8a113d files/20030817-buildengine-makefile-cflags.patch 523
 MD5 ccf71074bb15e3a511194a887a3a7040 files/duke3d.cfg 4314
-MD5 d9b4e6eca1f10d7502ce7c8b360ba16b files/network.cfg 398
+MD5 50643150138fd99d9cfb2ed68df15e7d files/20040817-duke3d-makefile-opts.patch 863
 MD5 dfe6b67444e51a0fa3ff5c5bf76261d8 files/20030817-credits.patch 1273
 MD5 7c796eee05f2a392dd0449339bc37804 files/digest-duke3d-20040817 69
-MD5 6ba6bae3aa96076fbb7dc72e06d93d3d files/20040817-credits.patch 1267
-MD5 50643150138fd99d9cfb2ed68df15e7d files/20040817-duke3d-makefile-opts.patch 863
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBItZpHTu7gpaalycRAnBBAJ9QvPasKngOB23vvGdhI59zZEN7twCePk78
-2MWlANJ6fAOe96vEOdgcLXs=
-=zKw1
------END PGP SIGNATURE-----
+MD5 73621a8c90765f4722208283a01319f7 files/digest-duke3d-20030817-r1 66
diff --git a/games-fps/duke3d/duke3d-20040817.ebuild b/games-fps/duke3d/duke3d-20040817.ebuild
index a9dbeb8c43e7..b007027118c0 100644
--- a/games-fps/duke3d/duke3d-20040817.ebuild
+++ b/games-fps/duke3d/duke3d-20040817.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1 2004/08/18 04:08:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.2 2004/08/22 14:06:25 chainsaw Exp $
 
 fromcvs=0
 ECVS_MODULE="duke3d"
@@ -60,6 +60,7 @@ src_unpack() {
 	cd ${S}/source
 	epatch "${FILESDIR}/${PV}-credits.patch"
 	epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" # need to sync features with build engine
+	epatch "${FILESDIR}/${PV}-gcc34.patch" # compile fixes for GCC 3.4
 	sed -i \
 		-e "/^useopengl := / s:=.*:= $(use_tf opengl):" \
 		-e "/^usephysfs := / s:=.*:= false:" \
diff --git a/games-fps/duke3d/files/20040817-gcc34.patch b/games-fps/duke3d/files/20040817-gcc34.patch
new file mode 100644
index 000000000000..a7de9c116383
--- /dev/null
+++ b/games-fps/duke3d/files/20040817-gcc34.patch
@@ -0,0 +1,82 @@
+--- source/astub.c.orig	2004-08-22 14:44:50.691126872 +0100
++++ source/astub.c	2004-08-22 14:47:15.532107696 +0100
+@@ -540,6 +540,11 @@
+         return(tempbuf);
+ } //end
+ 
++void SpriteName(short spritenum, char *lo2)
++{
++    sprintf(lo2,names[sprite[spritenum].picnum]);
++}// end SpriteName
++
+ const char *ExtGetSpriteCaption(short spritenum)
+ {
+ 
+@@ -608,7 +613,11 @@
+ //  y1, y2  0-143  (status bar is 144 high, origin is top-left of STATUS BAR)
+ //  col     0-15
+ 
+-
++void PrintStatus(char *string,int num,char x,char y,char color)
++{
++     sprintf(tempbuf,"%s %d",string,num);
++     printext16(x*8,y*8,color,-1,tempbuf,0);
++}
+ 
+ void TotalMem()
+ {
+@@ -1276,18 +1285,6 @@
+ 
+ }
+ 
+-
+-void PrintStatus(char *string,int num,char x,char y,char color)
+-{
+-     sprintf(tempbuf,"%s %d",string,num);
+-     printext16(x*8,y*8,color,-1,tempbuf,0);
+-}
+-
+-void SpriteName(short spritenum, char *lo2)
+-{
+-    sprintf(lo2,names[sprite[spritenum].picnum]);
+-}// end SpriteName
+-
+ char GAMEpalette[768];
+ char WATERpalette[768];
+ char SLIMEpalette[768];
+@@ -1326,6 +1323,17 @@
+  ReadGamePalette();
+ }// end ReadPaletteTable
+ 
++void Ver()
++{
++ sprintf(tempbuf,"DUKE NUKEM BUILD: V032696");
++ if (qsetmode == 200)    //In 3D mode
++ { printext256(60*8,24*8,11,-1,tempbuf,1);
++   rotatesprite((320-8)<<16,(200-8)<<16,64<<9,0,SPINNINGNUKEICON+(((4-totalclock>>3))&7),0,0,0,0,0,xdim-1,ydim-1);
++ }else
++ { printext16(0,0,15,-1,tempbuf,0);
++ }
++}
++
+ void Keys3d(void)
+ {
+     long i,count,rate,nexti;
+@@ -2206,17 +2214,6 @@
+         }
+ }
+ 
+-void Ver()
+-{
+- sprintf(tempbuf,"DUKE NUKEM BUILD: V032696");
+- if (qsetmode == 200)    //In 3D mode
+- { printext256(60*8,24*8,11,-1,tempbuf,1);
+-   rotatesprite((320-8)<<16,(200-8)<<16,64<<9,0,SPINNINGNUKEICON+(((4-totalclock>>3))&7),0,0,0,0,0,xdim-1,ydim-1);
+- }else
+- { printext16(0,0,15,-1,tempbuf,0);
+- }
+-}
+-
+ ActorMem(int i)
+ {int total=0,j;
+     switch(i)