Patch for gcc-4.2

Package-Manager: portage-2.1.2.9

4 files changed, 64 insertions, 15 deletions

diff --git a/games-strategy/freecnc/ChangeLog b/games-strategy/freecnc/ChangeLog
index 2f0d81477ff2..4e3c5c56dab3 100644
--- a/games-strategy/freecnc/ChangeLog
+++ b/games-strategy/freecnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecnc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.10 2007/03/12 18:05:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.11 2007/06/13 23:57:51 nyhm Exp $
+
+  13 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/freecnc-0.2.1.31072003-gcc42.patch, freecnc-0.2.1.31072003.ebuild:
+  Patch for gcc-4.2
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org>
   freecnc-0.2.1.31072003.ebuild:
diff --git a/games-strategy/freecnc/Manifest b/games-strategy/freecnc/Manifest
index 4a7f6a546346..fac747f77be0 100644
--- a/games-strategy/freecnc/Manifest
+++ b/games-strategy/freecnc/Manifest
@@ -21,17 +21,21 @@ AUX freecnc-0.2.1.31072003-gcc4.patch 403 RMD160 2aa4b9ecfe762cbb6599ad8a502d384
 MD5 b7a2487d3f2a0c36ab831cc34f300c15 files/freecnc-0.2.1.31072003-gcc4.patch 403
 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 files/freecnc-0.2.1.31072003-gcc4.patch 403
 SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1 files/freecnc-0.2.1.31072003-gcc4.patch 403
+AUX freecnc-0.2.1.31072003-gcc42.patch 725 RMD160 d738974841ec331a3865600c7484742d6c9228a8 SHA1 cf41e50df3053522147f74f37195c1f224e8062e SHA256 c4434062d2848a7d170d5dda9289b4b81a451c4b35f453f722c9b0bc11a1d06b
+MD5 8082c2b6158d3178d7f2e737fc59f07b files/freecnc-0.2.1.31072003-gcc42.patch 725
+RMD160 d738974841ec331a3865600c7484742d6c9228a8 files/freecnc-0.2.1.31072003-gcc42.patch 725
+SHA256 c4434062d2848a7d170d5dda9289b4b81a451c4b35f453f722c9b0bc11a1d06b files/freecnc-0.2.1.31072003-gcc42.patch 725
 DIST cc1demo1.zip 9367945 RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 SHA1 fce488d0f9090cd96e6b064f0821ecf299b71962 SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87
 DIST cc1demo2.zip 17797920 RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 SHA1 a154a12f2479b76601081f2bdb49286b5bb040dc SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48
 DIST freecnc++-0.2.1.31072003-src.tar.bz2 271980 RMD160 e249a600a54a5a0aa791219360011724b8e273f2 SHA1 40d742f4acc9d175bb3b7ef1deddd1cdb18ba285 SHA256 512f55708791742093703b5ebe7ebe7b3e0c3ca46562aa9fb8f526bafc514cc5
-EBUILD freecnc-0.2.1.31072003.ebuild 2267 RMD160 1c2a41d9fb16029ce62bdebc04fca6bbce3f5d9e SHA1 1452661d8491b5116ec047a653bfa67ef6f7bada SHA256 9f8d5224ab78dac912f2e96df1eef6924f241d0017e51d00f66d3183d802e62e
-MD5 fe1b62b01a6e9ffc2bcd5479768cfde0 freecnc-0.2.1.31072003.ebuild 2267
-RMD160 1c2a41d9fb16029ce62bdebc04fca6bbce3f5d9e freecnc-0.2.1.31072003.ebuild 2267
-SHA256 9f8d5224ab78dac912f2e96df1eef6924f241d0017e51d00f66d3183d802e62e freecnc-0.2.1.31072003.ebuild 2267
-MISC ChangeLog 1533 RMD160 7671cee5500e5d928a380fc9b7e04fed25e67523 SHA1 92607f8e696c96416a237d32a278daa2b0cacbd9 SHA256 1e081f746ffab8781636a65003d08f2dfd93773d25cc968535b2dfcb306a3ea9
-MD5 fe566abd198725f259752201c92dd99f ChangeLog 1533
-RMD160 7671cee5500e5d928a380fc9b7e04fed25e67523 ChangeLog 1533
-SHA256 1e081f746ffab8781636a65003d08f2dfd93773d25cc968535b2dfcb306a3ea9 ChangeLog 1533
+EBUILD freecnc-0.2.1.31072003.ebuild 2302 RMD160 db8e0e37e4e5d57ab4a3846bd11c4e5a298f551e SHA1 910911e3290304de65f2cfc5bbd9a8c3a6bdd87c SHA256 cf22989cc5980d5ad5afdc7ac6bf0b37c14ef8ea8c19f8ce81e562d80bc59693
+MD5 ee849d3acb981ccce689e0fbc8d8a4ce freecnc-0.2.1.31072003.ebuild 2302
+RMD160 db8e0e37e4e5d57ab4a3846bd11c4e5a298f551e freecnc-0.2.1.31072003.ebuild 2302
+SHA256 cf22989cc5980d5ad5afdc7ac6bf0b37c14ef8ea8c19f8ce81e562d80bc59693 freecnc-0.2.1.31072003.ebuild 2302
+MISC ChangeLog 1676 RMD160 d9aa09eed4a342621aa6c779aa236be012b1e3b1 SHA1 f8819ba32ed7b4b9b7e2e37828380a9666abda36 SHA256 6a0e5b4acc58800a3bba9aacc51fa139fef8f5613f787b5a5ffa7cf1ad653256
+MD5 3ec683f88a9041b9b1b47c3738ef0e84 ChangeLog 1676
+RMD160 d9aa09eed4a342621aa6c779aa236be012b1e3b1 ChangeLog 1676
+SHA256 6a0e5b4acc58800a3bba9aacc51fa139fef8f5613f787b5a5ffa7cf1ad653256 ChangeLog 1676
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -40,9 +44,9 @@ MD5 0c0285caf26128f1b2fb8d3adf5812a7 files/digest-freecnc-0.2.1.31072003 732
 RMD160 d52931537e7d6a1eedbb1021a60993c3b415b2ad files/digest-freecnc-0.2.1.31072003 732
 SHA256 4b3c8208e11a10196c1a16c81f493db49aa8739cb9cc10b83227c28b234bf342 files/digest-freecnc-0.2.1.31072003 732
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGFAiAdz7hIScOURERAmOIAJ0f9l8wmq3mgha+kYBp28e4V9m9/gCgrfD6
-auRYAq7A7B7XxfJg4hhAaAc=
-=HOlW
+iD8DBQFGcISEdz7hIScOURERAibNAJ0UCihP/KZ9pXVBnwCZ5xU96Lq2LgCg3n7H
+BU6DFb+SiARMGXv2yat/DRw=
+=bxnO
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freecnc/files/freecnc-0.2.1.31072003-gcc42.patch b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-gcc42.patch
new file mode 100644
index 000000000000..2c8b4d35c165
--- /dev/null
+++ b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-gcc42.patch
@@ -0,0 +1,40 @@
+--- tools/shpview/shpview.cpp
++++ tools/shpview/shpview.cpp
+@@ -19,7 +19,7 @@
+ 
+ Logger* logger;
+ 
+-void loadPal(char* palname);
++void loadPal(const char* palname);
+ 
+ void usage(char* biname)
+ {
+@@ -92,7 +92,7 @@
+     exit(0);
+ }
+ 
+-void loadPal(char *palname)
++void loadPal(const char *palname)
+ {
+     VFile *mixfile;
+     SDL_Color palette[256];
+--- tools/tmpinied/tmpinied.cpp
++++ tools/tmpinied/tmpinied.cpp
+@@ -13,7 +13,7 @@
+ 
+ #define TEMPLATES 216
+ 
+-void loadPal(char *palname);
++void loadPal(const char *palname);
+ 
+ 
+ TemplateImage *TemplateData::getImage()
+@@ -316,7 +316,7 @@
+     exit(0);
+ }
+ 
+-void loadPal(char *palname)
++void loadPal(const char *palname)
+ {
+     VFile *mixfile;
+     //Uint32 offset, size;
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index 5dad06da3724..04b047941c23 100644
--- a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.12 2007/04/04 20:20:07 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.13 2007/06/13 23:57:51 nyhm Exp $
 
 inherit flag-o-matic eutils games
 
@@ -37,7 +37,8 @@ src_unpack() {
 		"${FILESDIR}"/${PV}-makefile-cflags.patch \
 		"${FILESDIR}"/${PV}-remove-root.patch \
 		"${FILESDIR}"/${PV}-gentoo-paths.patch \
-		"${FILESDIR}"/${P}-gcc4.patch
+		"${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-gcc42.patch
 	sed -i \
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \