r12584 - in packages/trunk/funguloids/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-08-13 13:07:30 +0000 (Sat, 13 Aug 2011)
New Revision: 12584

Added:
   packages/trunk/funguloids/debian/patches/g++4.6.patch
Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/patches/series
Log:
Fix FTBFS due to newer GCC (#633297)

Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog	2011-08-13 13:05:30 UTC (rev 12583)
+++ packages/trunk/funguloids/debian/changelog	2011-08-13 13:07:30 UTC (rev 12584)
@@ -5,6 +5,7 @@
   * Wrap the build-deps and deps one per line
   * Switch to dpkg-source v3 format
   * Switch to debhelper 7 dh & dh-autoreconf
+  * Fix FTBFS due to newer GCC (#633297)
 
  -- Paul Wise <pabs at debian.org>  Sat, 02 Apr 2011 13:12:20 +0800
 

Added: packages/trunk/funguloids/debian/patches/g++4.6.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/g++4.6.patch	                        (rev 0)
+++ packages/trunk/funguloids/debian/patches/g++4.6.patch	2011-08-13 13:07:30 UTC (rev 12584)
@@ -0,0 +1,54 @@
+--- a/include/openalsoundsystem.h
++++ b/include/openalsoundsystem.h
+@@ -47,7 +47,7 @@
+ using namespace std;
+ 
+ 
+-typedef map<String, ALuint> SoundMapType;
++typedef std::map<String, ALuint> SoundMapType;
+ 
+ // Number of independent channels for sound fx
+ const int NUM_SOUND_CHANNELS = 32;
+--- a/include/objectsystem.h
++++ b/include/objectsystem.h
+@@ -34,7 +34,7 @@
+ using namespace std;
+ using namespace Ogre;
+ 
+-typedef map<String, MovingObject*> ObjectMapType;
++typedef std::map<String, MovingObject*> ObjectMapType;
+ 
+ // ObjectSystem
+ class ObjectSystem : public Singleton<ObjectSystem> {
+--- a/include/mpakogre.h
++++ b/include/mpakogre.h
+@@ -49,6 +49,7 @@
+ 	void unload();
+ 
+ 	DataStreamPtr open(const String &filename) const;
++	DataStreamPtr open(const String &filename, bool) const { return open(filename); };
+ 	StringVectorPtr list(bool recursive = true, bool dirs = false);
+ 	FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false);
+ 
+--- a/src/scriptsystem.cpp
++++ b/src/scriptsystem.cpp
+@@ -48,7 +48,7 @@
+ 
+ 
+ // This keeps track of the lights created in script
+-static vector<Light*> scriptLights;
++static std::vector<Light*> scriptLights;
+ 
+ 
+ // File locator for script files
+--- a/src/playlist.cpp
++++ b/src/playlist.cpp
+@@ -42,7 +42,7 @@
+ using namespace std;
+ 
+ // Play list files
+-static vector<String> playList;
++static std::vector<String> playList;
+ static unsigned int currentSong = -1;
+ 
+ 

Modified: packages/trunk/funguloids/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series	2011-08-13 13:05:30 UTC (rev 12583)
+++ packages/trunk/funguloids/debian/patches/series	2011-08-13 13:07:30 UTC (rev 12584)
@@ -4,3 +4,4 @@
 alc_error.patch
 g++4.3_fix.patch
 ogre-1.6.1.patch
+g++4.6.patch