Fix building with GLIBC 2.10+ wrt #277072, thanks to Dominik Kapusta for patch.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 115 insertions, 4 deletions

diff --git a/games-sports/toycars/ChangeLog b/games-sports/toycars/ChangeLog
index b96f7d76afa2..638479e4e8af 100644
--- a/games-sports/toycars/ChangeLog
+++ b/games-sports/toycars/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/toycars
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.13 2009/07/01 02:14:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.14 2009/08/12 20:37:10 ssuominen Exp $
+
+  12 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> toycars-0.3.10.ebuild,
+  +files/toycars-0.3.10-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277072, thanks to Dominik Kapusta for
+  patch.
 
 *toycars-0.3.10 (01 Jul 2009)
 
diff --git a/games-sports/toycars/Manifest b/games-sports/toycars/Manifest
index 5451a73b9d1b..bef0a6ce87fe 100644
--- a/games-sports/toycars/Manifest
+++ b/games-sports/toycars/Manifest
@@ -1,4 +1,5 @@
+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 1093 RMD160 15e3f2c4586967a95dd1f4ffd7530b16a11197c0 SHA1 1c6058733e27287787fa575e1ed2580aa690137f SHA256 2d7ef1006669266887864de3c1d9877fa2bd13442b0ac0d1b097e45e5735dcb3
-MISC ChangeLog 2173 RMD160 728910ac8ebba511c971ae06290cf258ff5c2df4 SHA1 112806f7c61ce8d9da3f01bae985648cf5ef52ac SHA256 4511bb5958d97e4d1fb36d3d25c51ce9394ed665f786953e0a245be32b38c632
+EBUILD toycars-0.3.10.ebuild 1156 RMD160 134a4f1b3e6148ffe3f8c2e937698ca58152a484 SHA1 a8595cea4b4b8efe5bcbf42162ff3f880bff5de6 SHA256 880343009dde28192ba89b2adbc33f3a82ecae9265f1621bbfe2bcb364c12a5a
+MISC ChangeLog 2377 RMD160 5165f3bebc8c5068cdd5b061a12a6e77bce12355 SHA1 086b37e2e2b7d4277e77d66e3499cc872c3fdfcd SHA256 20bffbcbeb763e21cd1eda4036ca7e76beb4ab69bed59f81ceee07268cf335ec
 MISC metadata.xml 592 RMD160 22f227feb81d3d4aac659471c21dec61af220b46 SHA1 484057930ea56def340f4d0d322b1703c8de2074 SHA256 9ebc59b9b09bb528703fa1886257d647fbe8a1266b7256ca28ff4daa19094e80
diff --git a/games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch b/games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch
new file mode 100644
index 000000000000..e3c184724c6d
--- /dev/null
+++ b/games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch
@@ -0,0 +1,101 @@
+diff --git a/toycars_track_editor/src/TrackView.cxx b/toycars_track_editor/src/TrackView.cxx
+index d52daba..e1a66df 100644
+--- a/toycars_track_editor/src/TrackView.cxx
++++ b/toycars_track_editor/src/TrackView.cxx
+@@ -89,7 +89,7 @@ TiXmlDocument *findXMLFile(const char *filename, SearchDirectories *dirs, char *
+ //{jpg,png,bmp,pnm,pbm,pgm,ppm}
+ Fl_Image* loadImage(const char *filename)
+ {
+-   char *suffix = strrchr(filename, '.');
++   const char *suffix = strrchr(filename, '.');
+    if (suffix == NULL)
+       return NULL;
+    if (strcmp(suffix,".jpg") == 0)
+@@ -969,13 +969,13 @@ void TrackView::installMap(const char *name)
+    uninstallMap(name);
+    
+    // chop off any .xml suffix
+-   temp = strrchr(name, '.');
++   temp = const_cast<char*>( strrchr(name, '.') );
+    if (temp) {
+       if (strcmp(temp, ".xml") == 0)
+          temp[0] = '\0';
+    }
+    // remove path
+-   temp = strrchr(name, '/');
++   temp = const_cast<char*>( strrchr(name, '/') );
+    if (temp) {
+       strncpy(trackname, temp+1, 255);
+    }
+@@ -1044,13 +1044,13 @@ void TrackView::uninstallMap(const char *name)
+    char *temp;
+    
+    // chop off any .xml suffix
+-   temp = strrchr(name, '.');
++   temp = const_cast<char*>( strrchr(name, '.') );
+    if (temp) {
+       if (strcmp(temp, ".xml") == 0)
+          temp[0] = '\0';
+    }
+    // remove path
+-   temp = strrchr(name, '/');
++   temp = const_cast<char*>( strrchr(name, '/') );
+    if (temp) {
+       strncpy(trackname, temp+1, 255);
+    }
+diff --git a/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp b/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp
+index 4b6ff50..7aa6c40 100644
+--- a/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp
++++ b/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp
+@@ -23,7 +23,7 @@
+ //{jpg,png,bmp,pnm,pbm,pgm,ppm}
+ Fl_Image* loadImage(const char *filename)
+ {
+-   char *suffix = strrchr(filename, '.');
++   const char *suffix = strrchr(filename, '.');
+    if (suffix == NULL)
+       return NULL;
+    if (strcmp(suffix,".jpg") == 0)
+diff --git a/toycars_vehicle_editor/src/VehicleObject.cpp b/toycars_vehicle_editor/src/VehicleObject.cpp
+index 3f61114..0bd2978 100644
+--- a/toycars_vehicle_editor/src/VehicleObject.cpp
++++ b/toycars_vehicle_editor/src/VehicleObject.cpp
+@@ -533,13 +533,13 @@ void VehicleObject::installVehicle(const char *name)
+    uninstallVehicle(name);
+    
+    // chop off any .xml suffix
+-   temp = strrchr(name, '.');
++   temp = const_cast<char*>( strrchr(name, '.') );
+    if (temp) {
+       if (strcmp(temp, ".xml") == 0)
+          temp[0] = '\0';
+    }
+    // remove path
+-   temp = strrchr(name, '/');
++   temp = const_cast<char*>( strrchr(name, '/') );
+    if (temp) {
+       strncpy(carname, temp+1, 255);
+    }
+@@ -610,13 +610,13 @@ void VehicleObject::uninstallVehicle(const char *name)
+    char *temp;
+    
+    // chop off any .xml suffix
+-   temp = strrchr(name, '.');
++   temp = const_cast<char*>( strrchr(name, '.') );
+    if (temp) {
+       if (strcmp(temp, ".xml") == 0)
+          temp[0] = '\0';
+    }
+    // remove path
+-   temp = strrchr(name, '/');
++   temp = const_cast<char*>( strrchr(name, '/') );
+    if (temp) {
+       strncpy(carname, temp+1, 255);
+    }
+@@ -675,4 +675,4 @@ void VehicleObject::uninstallVehicle(const char *name)
+    system(str);
+    */
+ #endif
+-}
+\ No newline at end of file
++}
diff --git a/games-sports/toycars/toycars-0.3.10.ebuild b/games-sports/toycars/toycars-0.3.10.ebuild
index a91d46ce649e..d436c6d3bc92 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-2009 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.2 2009/07/29 01:13:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/toycars-0.3.10.ebuild,v 1.3 2009/08/12 20:37:10 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -21,6 +21,10 @@ DEPEND="media-libs/libsdl[video]
 	virtual/glu
 	virtual/opengl"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
 src_configure() {
 	append-ldflags -L/opt/fmodex/api/lib
 	egamesconf