summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2009-06-13 18:01:41 +0000
committerTristan Heaven <nyhm@gentoo.org>2009-06-13 18:01:41 +0000
commit985322058648a73ef814b34a1fc55bb3abf8d022 (patch)
tree5915c8290d3b58a93c2c3e4f601c0a8e9bb32ad9 /games-strategy
parentFix building with glibc-2.10, bug #273412 (diff)
downloadgentoo-2-985322058648a73ef814b34a1fc55bb3abf8d022.tar.gz
gentoo-2-985322058648a73ef814b34a1fc55bb3abf8d022.tar.bz2
gentoo-2-985322058648a73ef814b34a1fc55bb3abf8d022.zip
Fix building with glibc-2.10, bug #273494
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/freecnc/ChangeLog9
-rw-r--r--games-strategy/freecnc/files/freecnc-0.2.1.31072003-glibc2.10.patch11
-rw-r--r--games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild5
3 files changed, 21 insertions, 4 deletions
diff --git a/games-strategy/freecnc/ChangeLog b/games-strategy/freecnc/ChangeLog
index a4e6ed829b5a..ae3b1b475618 100644
--- a/games-strategy/freecnc/ChangeLog
+++ b/games-strategy/freecnc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-strategy/freecnc
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.12 2009/03/02 16:42:08 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.13 2009/06/13 18:01:40 nyhm Exp $
+
+ 13 Jun 2009; Tristan Heaven <nyhm@gentoo.org>
+ freecnc-0.2.1.31072003.ebuild,
+ +files/freecnc-0.2.1.31072003-glibc2.10.patch:
+ Fix building with glibc-2.10, bug #273494
02 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org>
freecnc-0.2.1.31072003.ebuild:
diff --git a/games-strategy/freecnc/files/freecnc-0.2.1.31072003-glibc2.10.patch b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-glibc2.10.patch
new file mode 100644
index 000000000000..2b9ec7bf571c
--- /dev/null
+++ b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- src/vfs/vfsplugman.cpp
++++ src/vfs/vfsplugman.cpp
+@@ -39,7 +39,7 @@
+ struct LoadedVFSPlugin newPlug;
+ PFDLLOADARCHIVE loadArchive;
+
+- extension = strrchr(archname, '.');
++ extension = strrchr((char *)archname, '.');
+ if( extension == NULL ) {
+ return false;
+ }
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index a4efce848620..b63d6809de0b 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-2009 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.14 2009/03/02 16:42:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.15 2009/06/13 18:01:40 nyhm Exp $
inherit flag-o-matic eutils games
@@ -38,7 +38,8 @@ src_unpack() {
"${FILESDIR}"/${PV}-remove-root.patch \
"${FILESDIR}"/${PV}-gentoo-paths.patch \
"${FILESDIR}"/${P}-gcc4.patch \
- "${FILESDIR}"/${P}-gcc42.patch
+ "${FILESDIR}"/${P}-gcc42.patch \
+ "${FILESDIR}"/${P}-glibc2.10.patch
sed -i \
-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \