summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-07-13 10:46:03 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-07-13 10:46:03 +0000
commitb567e4c86000d8d8d82f43f90c778dbc66613ced (patch)
tree14c35c2f4f29ee4f85fd0a652abc389021d91198 /games-strategy/glob2
parentFixed encoding in ChangeLog (diff)
downloadhistorical-b567e4c86000d8d8d82f43f90c778dbc66613ced.tar.gz
historical-b567e4c86000d8d8d82f43f90c778dbc66613ced.tar.bz2
historical-b567e4c86000d8d8d82f43f90c778dbc66613ced.zip
Fix build with gcc-4.4 Bug #277179
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-strategy/glob2')
-rw-r--r--games-strategy/glob2/ChangeLog6
-rw-r--r--games-strategy/glob2/Manifest15
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.1-gcc44.patch12
-rw-r--r--games-strategy/glob2/glob2-0.9.4.1.ebuild4
4 files changed, 23 insertions, 14 deletions
diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog
index cb9b663ae98e..caacc3e3a5ff 100644
--- a/games-strategy/glob2/ChangeLog
+++ b/games-strategy/glob2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/glob2
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.47 2009/06/09 08:48:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.48 2009/07/13 10:46:02 tupone Exp $
+
+ 13 Jul 2009; Tupone Alfredo <tupone@gentoo.org>
+ +files/glob2-0.9.4.1-gcc44.patch, glob2-0.9.4.1.ebuild:
+ Fix build with gcc-4.4 Bug #277179 by <flameeyes@gentoo.org>
09 Jun 2009; Christian Faulhammer <fauli@gentoo.org> glob2-0.9.4.1.ebuild:
stable x86, bug 272098
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index bf13cf829056..6f321879c5b0 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX glob2-0.9.3-gcc43.patch 513 RMD160 2f33dc3a2f06711e56617c04c6bdf76a9113c59f SHA1 6fc603536c18482b6904b4e0321395df6ff256ea SHA256 cf40814f00e4065d03758e5378326c882318a5b63d89739290f31ca53388c3d4
+AUX glob2-0.9.4.1-gcc44.patch 256 RMD160 75b0d67440f043255dc26aa361a9c98b41b2a31b SHA1 35ed41922dddc42194341e07a6a4605b2715f102 SHA256 053cf0dc887340c9ded2e012e7e9dd87763fe5a6e4134e61baa791d6e8e6494c
DIST glob2-0.9.3.tar.gz 10688792 RMD160 266edd6a57f1e8ea8e1effac3871f3c0083fc05f SHA1 669a43707cf03e4e810e77ef8bef2f46f1116090 SHA256 07e2c09e1fc2a780ceb9e5b7e6fbb32cd6018f137f861cf2c1e1daa09339ce20
DIST glob2-0.9.4.1.tar.gz 11605247 RMD160 b2f7c4369741fc003f1db14c6579c3586494bdc9 SHA1 693b5a2da668800e2ce563b92a0185a360b57d74 SHA256 7e901e9f791d766832b9093546803e7bd5bda114c2cea333cff9027b32dcfdea
EBUILD glob2-0.9.3.ebuild 1357 RMD160 a1472c3767cfb26e5daea8a325e479c831457961 SHA1 aa524db7f7e01af83657b032b96a90827e6635ba SHA256 331003546a2a47e3235e2e58bbc55a04c77e2f59da519ff6ddef6a1bacac06b0
-EBUILD glob2-0.9.4.1.ebuild 1395 RMD160 371d87b56dbb2e89c2639cd2a4b0f04a81ca85c1 SHA1 c630d5af02a4e739aaf2562ccd8f95c4c21c9383 SHA256 e3104fa65e01dfc982be4a5355a8305b419c92838ac3733cf90bdf4243756d58
-MISC ChangeLog 5636 RMD160 4af9f4dcbaedce2d9d52c5b676922c43c9cf4468 SHA1 7ba6d5d0fdcd12b536b8e0c8511c851b19b4e8e1 SHA256 2d6065660b689479db04bda999b23e3b622f67718c8a62d4f1d4bfc012bf3335
+EBUILD glob2-0.9.4.1.ebuild 1440 RMD160 9f6d27d2f2142a6cb4677408a3e75d54dd91e5e8 SHA1 ed6c815a308649945a93a598fe3039c470ed7f98 SHA256 376831decbba417bfcac6c7e2d520f2aff54b6576a3f2917589f6b22ea093151
+MISC ChangeLog 5809 RMD160 f3d07a332c7ff3c2a8d8ea43336df297e2ee72bb SHA1 4d4d9030c79bb5bc20e7f7fb15517a9e45c0821e SHA256 4af3947bc20b349f54f577db97ecc77b30a74dc5c55fe40522882ff254b3b9f9
MISC metadata.xml 546 RMD160 702338ae8936b3f81e43ded8c08aa74ce919a1c8 SHA1 0cddda4674a8c9a8ac51f68fa211131220c814a5 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkouIckACgkQNQqtfCuFneOcDgCeKMHCgeH7mcIxe3kgEOA3+YKK
-8LEAnjPzQHXuKQTLqPoyTHcx+sWwlXmN
-=JEmc
------END PGP SIGNATURE-----
diff --git a/games-strategy/glob2/files/glob2-0.9.4.1-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.1-gcc44.patch
new file mode 100644
index 000000000000..67aa1a0789c4
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.1-gcc44.patch
@@ -0,0 +1,12 @@
+--- libgag/include/StreamBackend.h.old 2009-07-13 10:52:36.000000000 +0200
++++ libgag/include/StreamBackend.h 2009-07-13 10:52:57.000000000 +0200
+@@ -28,6 +28,9 @@
+ #ifdef putc
+ #undef putc
+ #endif
++#ifdef getc
++#undef getc
++#endif
+
+ namespace GAGCore
+ {
diff --git a/games-strategy/glob2/glob2-0.9.4.1.ebuild b/games-strategy/glob2/glob2-0.9.4.1.ebuild
index 255be1afede6..02fbdbd7ba80 100644
--- a/games-strategy/glob2/glob2-0.9.4.1.ebuild
+++ b/games-strategy/glob2/glob2-0.9.4.1.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/glob2/glob2-0.9.4.1.ebuild,v 1.4 2009/06/09 08:48:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.1.ebuild,v 1.5 2009/07/13 10:46:02 tupone Exp $
EAPI=2
inherit eutils games
@@ -27,6 +27,8 @@ RDEPEND="virtual/opengl
DEPEND="${RDEPEND}
>=dev-util/scons-1"
+PATCHES=( "${FILESDIR}"/${P}-gcc44.patch )
+
src_compile() {
local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[0-9]\+\).*/\1/; p }")