summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-04-09 19:22:27 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-04-09 19:22:27 +0000
commit135b1b633f2aeac19b55499c78ab5b395b4b59a3 (patch)
treeba835f306c9c9e05aa4c9b3c4c518e7442faa41b /games-sports
parentMoved from dev-php5/jpgraph (diff)
downloadhistorical-135b1b633f2aeac19b55499c78ab5b395b4b59a3.tar.gz
historical-135b1b633f2aeac19b55499c78ab5b395b4b59a3.tar.bz2
historical-135b1b633f2aeac19b55499c78ab5b395b4b59a3.zip
Fix build with gcc-4.6 Bug #362735
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'games-sports')
-rw-r--r--games-sports/toycars/ChangeLog6
-rw-r--r--games-sports/toycars/Manifest11
-rw-r--r--games-sports/toycars/files/toycars-0.3.10-gcc46.patch10
-rw-r--r--games-sports/toycars/toycars-0.3.10.ebuild6
4 files changed, 25 insertions, 8 deletions
diff --git a/games-sports/toycars/ChangeLog b/games-sports/toycars/ChangeLog
index c47165a61f49..eb89e4ef679f 100644
--- a/games-sports/toycars/ChangeLog
+++ b/games-sports/toycars/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-sports/toycars
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.18 2011/03/20 20:16:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.19 2011/04/09 19:22:27 tupone Exp $
+
+ 09 Apr 2011; Alfredo Tupone <tupone@gentoo.org> toycars-0.3.10.ebuild,
+ +files/toycars-0.3.10-gcc46.patch:
+ Fix build with gcc-4.6 Bug #362735 by Diego Elio Pettenò
20 Mar 2011; Justin Lecher <jlec@gentoo.org> toycars-0.3.10.ebuild:
x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
diff --git a/games-sports/toycars/Manifest b/games-sports/toycars/Manifest
index 0d92454af0ed..020e8c50f8f9 100644
--- a/games-sports/toycars/Manifest
+++ b/games-sports/toycars/Manifest
@@ -2,15 +2,16 @@
Hash: SHA1
AUX toycars-0.3.10-gcc45.patch 1428 RMD160 625731a29840b39da1904af6d6c458aa1253ef15 SHA1 6bdbca6c9df9c5b4f62c14e7f1d9f1cb7be7b04e SHA256 07eae3db69fa651bce4d8889be4e88d9d667bd3428d287bc383104c1960d7cbc
+AUX toycars-0.3.10-gcc46.patch 252 RMD160 b024ac730833f549d9e0ca17a1c711ce8f596a3d SHA1 ec48a4b38dfa980f26e10afe552de0fe7fb0bfa6 SHA256 a99617bd76c57eab20dbb301de0f3b09e635d1eb6639e85027bb22d8132b360a
AUX toycars-0.3.10-glibc-2.10.patch 3321 RMD160 608e4c5fdf3cb90cd9ea6ebd9df0a85aa6aa4c05 SHA1 a068ac460a6c50d57ffb391f89fb17c05780618c SHA256 376863d635af659e4eda893c2ccd5718c9a93ca74deb2172bd047ab9f12c3bcf
DIST toycars-0.3.10.tar.gz 6390760 RMD160 f613c7472cd8872d26ef7b4239bef8c744ee3073 SHA1 594f7cd3b586fc68289ea36945464dd4125dfded SHA256 8ead77f160128231e909e9c34dc158cbffe5917eb13effcfda4712484d609658
-EBUILD toycars-0.3.10.ebuild 1239 RMD160 4356cd6c5dfa74f60bb7b90a6b78d59afdfa6fb5 SHA1 757e9d395e0e6116fae1c9badc3b3c8481f07395 SHA256 809d3d7825b29fcdda61ed033d1c3df40ce10b0b2e720cdd1c53af12985d28ad
-MISC ChangeLog 2952 RMD160 712ea76344bcd17a07c0076928f90e64479afee2 SHA1 88911d99e78566e18034065e79ae52753457d91d SHA256 b635d64d21398d1d554b618b8105f5c3ac5f7ec61ed349d0ac7431a80f0adf10
+EBUILD toycars-0.3.10.ebuild 1296 RMD160 102ed2a8c57a42324e069e717c2e4d315f17f5d0 SHA1 4ecbbe435b99095f9c072e59071d45e38e77b494 SHA256 0db0ec54e23b5bd42cbb042d2bd70d6c4fb505dc58e4df85c793569810c28f3d
+MISC ChangeLog 3125 RMD160 2d64bc42bfd560bff4db8e2080ee402ab207fc41 SHA1 10010ba71c5ede831d781148493640dff7e7ae0c SHA256 cc8ea1b76cf9869aad4627695efbe5976979a0fb1dff31b55a0658b60e122ab2
MISC metadata.xml 592 RMD160 22f227feb81d3d4aac659471c21dec61af220b46 SHA1 484057930ea56def340f4d0d322b1703c8de2074 SHA256 9ebc59b9b09bb528703fa1886257d647fbe8a1266b7256ca28ff4daa19094e80
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2GYKAACgkQgAnW8HDreRY5xACgpV3K1LHkO3KKRjw+WJ+YuoRS
-JrgAoKRWikNdiBZD87XLwDvX2w5EGFQF
-=MmQn
+iEYEARECAAYFAk2gsfwACgkQIY77eQFFFC2bKwCgwxEvwgmWZnvZSKY9h7+af6j0
+jHMAoJvoF1ha04g7IQ/ykP7DOlmmCyf1
+=jeFq
-----END PGP SIGNATURE-----
diff --git a/games-sports/toycars/files/toycars-0.3.10-gcc46.patch b/games-sports/toycars/files/toycars-0.3.10-gcc46.patch
new file mode 100644
index 000000000000..127b75920322
--- /dev/null
+++ b/games-sports/toycars/files/toycars-0.3.10-gcc46.patch
@@ -0,0 +1,10 @@
+--- toycars/src/MyFisix/Convex.h.old 2011-04-09 21:17:43.000000000 +0200
++++ toycars/src/MyFisix/Convex.h 2011-04-09 21:18:22.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "config.h"
+ #endif
+
++#include <cstddef>
+ #include <list>
+ using namespace std;
+
diff --git a/games-sports/toycars/toycars-0.3.10.ebuild b/games-sports/toycars/toycars-0.3.10.ebuild
index e16758f56325..1eab29539aa7 100644
--- a/games-sports/toycars/toycars-0.3.10.ebuild
+++ b/games-sports/toycars/toycars-0.3.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/toycars-0.3.10.ebuild,v 1.7 2011/03/20 20:16:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/toycars-0.3.10.ebuild,v 1.8 2011/04/09 19:22:27 tupone Exp $
EAPI=2
inherit eutils flag-o-matic games
@@ -20,11 +20,13 @@ DEPEND="media-libs/libsdl[audio,video,joystick]
>=media-libs/fmod-4.25.07-r1:1
virtual/glu
virtual/opengl"
+RDEPEND="${DEPEND}"
src_prepare() {
epatch \
"${FILESDIR}"/${P}-glibc-2.10.patch \
- "${FILESDIR}"/${P}-gcc45.patch
+ "${FILESDIR}"/${P}-gcc45.patch \
+ "${FILESDIR}"/${P}-gcc46.patch
mv data/tracks/Corner/{c,C}orner.map
}