summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-sports/toycars/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-sports/toycars/files')
-rw-r--r--games-sports/toycars/files/toycars-0.3.10-gcc45.patch37
-rw-r--r--games-sports/toycars/files/toycars-0.3.10-gcc46.patch10
-rw-r--r--games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch101
3 files changed, 148 insertions, 0 deletions
diff --git a/games-sports/toycars/files/toycars-0.3.10-gcc45.patch b/games-sports/toycars/files/toycars-0.3.10-gcc45.patch
new file mode 100644
index 000000000000..0e4f350a89dd
--- /dev/null
+++ b/games-sports/toycars/files/toycars-0.3.10-gcc45.patch
@@ -0,0 +1,37 @@
+Fixing compilation with gcc-4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=317751
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- toycars_vehicle_editor/src/VehicleEditorUI.cxx
++++ toycars_vehicle_editor/src/VehicleEditorUI.cxx
+@@ -228,7 +228,7 @@
+ sprintf(str, "%d", n);
+ convexChoice->add(str);
+ convexChoice->value(n);
+-vehicleObj.getGeometry()->push_back(std::list<Vec2D>::list());
++vehicleObj.getGeometry()->push_back(std::list<Vec2D>());
+ spriteView->setConvexChoice(n);
+ spriteView->redraw();
+ }
+--- toycars_vehicle_editor/src/VehicleObject.cpp
++++ toycars_vehicle_editor/src/VehicleObject.cpp
+@@ -152,7 +152,7 @@
+ short count;
+ geometry.clear();
+ for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) {
+- geometry.push_back(std::list<Vec2D>::list());
++ geometry.push_back(std::list<Vec2D>());
+ std::list<Vec2D> &convex = geometry.back();
+ readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count);
+ }
+@@ -411,7 +411,7 @@
+ short count;
+ geometry.clear();
+ for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) {
+- geometry.push_back(std::list<Vec2D>::list());
++ geometry.push_back(std::list<Vec2D>());
+ std::list<Vec2D> &convex = geometry.back();
+ readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count);
+ }
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/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
++}