summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-06-17 23:13:37 +0000
committerTristan Heaven <tristan@gentoo.org>2009-06-17 23:13:37 +0000
commitb459fac4e2c774100d9dea23eca918127e6923e2 (patch)
tree6d7c4aee03cf05adfe3ba8830bc266d078bcb4e3 /games-arcade
parentVersion bumped. (diff)
downloadhistorical-b459fac4e2c774100d9dea23eca918127e6923e2.tar.gz
historical-b459fac4e2c774100d9dea23eca918127e6923e2.tar.bz2
historical-b459fac4e2c774100d9dea23eca918127e6923e2.zip
Fix building with glibc-2.10, bug #273602
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/gunocide2ex/ChangeLog8
-rw-r--r--games-arcade/gunocide2ex/Manifest15
-rw-r--r--games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch14
-rw-r--r--games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild6
4 files changed, 37 insertions, 6 deletions
diff --git a/games-arcade/gunocide2ex/ChangeLog b/games-arcade/gunocide2ex/ChangeLog
index 0964c55d1606..6c80b0b33085 100644
--- a/games-arcade/gunocide2ex/ChangeLog
+++ b/games-arcade/gunocide2ex/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/gunocide2ex
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/ChangeLog,v 1.10 2009/06/10 23:37:34 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/ChangeLog,v 1.11 2009/06/17 23:13:36 nyhm Exp $
+
+ 17 Jun 2009; Tristan Heaven <nyhm@gentoo.org> gunocide2ex-1.0.ebuild,
+ +files/gunocide2ex-1.0-glibc2.10.patch:
+ Fix building with glibc-2.10, bug #273602
10 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org>
-files/1.0-gcc3.patch, -files/1.0-gcc4.patch,
diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
index cc8ef42defd0..aeba0117e0a4 100644
--- a/games-arcade/gunocide2ex/Manifest
+++ b/games-arcade/gunocide2ex/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gunocide2ex-1.0-build.patch 5419 RMD160 83cfff1446606149ba740c36f98781a0e3967d5f SHA1 403113c9e3554bf630cd533712c44a5ac3323b52 SHA256 05275b928ea8d8c0bd2328f1ea563a1b4086a16ee56906bfcd51adcaa661c1f8
+AUX gunocide2ex-1.0-glibc2.10.patch 377 RMD160 1a918ef97a9ad20dc3fe3776b0ffd7746cd9ae88 SHA1 ebf70442a0121d134f1beb197f5b781c3046aadb SHA256 8e9d4eaa9ea26a047384068a040dd0b02b070864475c8e0a0be849d99add4bde
DIST g2ex-setup.run 30844481 RMD160 a3d1bfddefd3cdd882a1fb9ab576fd205349de61 SHA1 910e198859ce22e792c508cbdb5abfc081ec98b8 SHA256 85cf7ff402b73271e24867c7b0c162b258d61a69065d6a848ea0b74c301a4fbe
-EBUILD gunocide2ex-1.0.ebuild 1905 RMD160 37082050089ad019f1b041b5cde43a48036157bd SHA1 1148f76b9a4c8f1113274529157b098649b8e50c SHA256 59ae6a9a3b4eff33b25883647257f627c3bd862ea81ffe0370fc81f037df8b77
-MISC ChangeLog 1476 RMD160 83babf2b0d43245475b754811f02074fbbde8e8d SHA1 0a2fd77b0cf73764bdec8b37d336bfbc7da54a1d SHA256 4f9b6954bdf9d039859d6f15dd81009eafb66dd25cbeb0c0fe14bb4ab0ee79d3
+EBUILD gunocide2ex-1.0.ebuild 1943 RMD160 d6ee0f66aabd389681a47b29bc17c60c7b961d20 SHA1 578e632155f077ad8957db86b58a5ccc8acfb9ee SHA256 0de4a63addf3b237301b0be3cc571907683c3fd57b11b1f50e1e5cdbddef3b2c
+MISC ChangeLog 1630 RMD160 6dc4f6c9bdd461e1f49e357910afa901cb0ed802 SHA1 3cca032e2e0242e17cc9478b4b8ccfe617468d1d SHA256 088197f4bd759dd796397c4e978574e58ac23fafbbbd2b27097f954031311967
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko5eKgACgkQdz7hIScOURGezgCgkGCI2OAc511xpPvcXAgorAic
+Yc0AoI5WiT8TIskUK52lgH8Ozt8HJ4ov
+=B/Xj
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
new file mode 100644
index 000000000000..6b659c76a82d
--- /dev/null
+++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
@@ -0,0 +1,14 @@
+--- src/mmgr.cpp
++++ src/mmgr.cpp
+@@ -228,9 +228,9 @@
+
+ static const char *sourceFileStripper(const char *sourceFile)
+ {
+- char *ptr = strrchr(sourceFile, '\\');
++ char *ptr = strrchr((char *)sourceFile, '\\');
+ if (ptr) return ptr + 1;
+- ptr = strrchr(sourceFile, '/');
++ ptr = strrchr((char *)sourceFile, '/');
+ if (ptr) return ptr + 1;
+ return sourceFile;
+ }
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
index 69baa296c22b..96f4f58fe074 100644
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0.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-arcade/gunocide2ex/gunocide2ex-1.0.ebuild,v 1.12 2009/06/10 23:37:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild,v 1.13 2009/06/17 23:13:36 nyhm Exp $
EAPI=2
inherit eutils toolchain-funcs games
@@ -26,7 +26,9 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
+ epatch \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-glibc2.10.patch
edos2unix config.cfg
sed -i \
-e "s:/usr/local/games/gunocide2ex/config\.cfg:${GAMES_SYSCONFDIR}/${PN}.cfg:" \