summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2007-06-13 23:57:51 +0000
committerTristan Heaven <nyhm@gentoo.org>2007-06-13 23:57:51 +0000
commit5f8d22f578061ef010726f80edf3e1465327b37a (patch)
tree3a4c8a12f39c1e80c5c1c7e98dce6f01a1a55110 /games-strategy/freecnc
parentstable x86, bug 180118; double negation changed to normal test for source USE... (diff)
downloadgentoo-2-5f8d22f578061ef010726f80edf3e1465327b37a.tar.gz
gentoo-2-5f8d22f578061ef010726f80edf3e1465327b37a.tar.bz2
gentoo-2-5f8d22f578061ef010726f80edf3e1465327b37a.zip
Patch for gcc-4.2
(Portage version: 2.1.2.9)
Diffstat (limited to 'games-strategy/freecnc')
-rw-r--r--games-strategy/freecnc/ChangeLog6
-rw-r--r--games-strategy/freecnc/files/freecnc-0.2.1.31072003-gcc42.patch40
-rw-r--r--games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild5
3 files changed, 48 insertions, 3 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/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}/:" \