Author: fabian-guest Date: 2013-06-07 08:57:56 +0000 (Fri, 07 Jun 2013) New Revision: 14236
Added: packages/trunk/funguloids/debian/patches/ogre-1.8.patch Modified: packages/trunk/funguloids/debian/changelog packages/trunk/funguloids/debian/control packages/trunk/funguloids/debian/patches/series Log: * Team upload. * Build against Ogre-1.8 with a little help from another patch courtesy of openSUSE Build Service (Closes: #704785). * Add a "Build-Conflicts: libboost-date-time1.49-dev (<< 1.49.0-4~)" to avoid the notorious TIME_UTC bug. Modified: packages/trunk/funguloids/debian/changelog =================================================================== --- packages/trunk/funguloids/debian/changelog 2013-06-07 04:41:29 UTC (rev 14235) +++ packages/trunk/funguloids/debian/changelog 2013-06-07 08:57:56 UTC (rev 14236) @@ -1,3 +1,13 @@ +funguloids (1.06-11) unstable; urgency=low + + * Team upload. + * Build against Ogre-1.8 with a little help from another patch courtesy + of openSUSE Build Service (Closes: #704785). + * Add a "Build-Conflicts: libboost-date-time1.49-dev (<< 1.49.0-4~)" + to avoid the notorious TIME_UTC bug. + + -- Fabian Greffrath <[email protected]> Fri, 07 Jun 2013 10:44:45 +0200 + funguloids (1.06-10) unstable; urgency=low * Team upload. Modified: packages/trunk/funguloids/debian/control =================================================================== --- packages/trunk/funguloids/debian/control 2013-06-07 04:41:29 UTC (rev 14235) +++ packages/trunk/funguloids/debian/control 2013-06-07 08:57:56 UTC (rev 14236) @@ -11,12 +11,14 @@ liblua5.1-0-dev, libmad0-dev, libogg-dev, - libogre-dev (>= 1.4.9), + libogre-1.8-dev, libois-dev, libopenal-dev, libvorbis-dev, pkg-config, python +Build-Conflicts: + libboost-date-time1.49-dev (<< 1.49.0-4~) Standards-Version: 3.9.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funguloids/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/funguloids/ Added: packages/trunk/funguloids/debian/patches/ogre-1.8.patch =================================================================== --- packages/trunk/funguloids/debian/patches/ogre-1.8.patch (rev 0) +++ packages/trunk/funguloids/debian/patches/ogre-1.8.patch 2013-06-07 08:57:56 UTC (rev 14236) @@ -0,0 +1,105 @@ +Description: Fix compilation with Ogre-1.8 +Origin: https://build.opensuse.org/package/files?package=funguloids&project=games + +--- a/include/mpakogre.h ++++ b/include/mpakogre.h +@@ -54,7 +54,7 @@ public: + FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false); + + StringVectorPtr find(const String &pattern, bool recursive = true, bool dirs = false); +- FileInfoListPtr findFileInfo(const String &pattern, bool recursive, bool dirs = false); ++ FileInfoListPtr findFileInfo(const String &pattern, bool recursive, bool dirs = false) const; + + bool exists(const String &filename); + time_t getModifiedTime(const String& filename); +--- a/src/mpakogre.cpp ++++ b/src/mpakogre.cpp +@@ -180,10 +180,10 @@ StringVectorPtr MPakArchive::find(const + return ret; + } + +-FileInfoListPtr MPakArchive::findFileInfo(const String &pattern, bool recursive, bool dirs) { ++FileInfoListPtr MPakArchive::findFileInfo(const String &pattern, bool recursive, bool dirs) const { + FileInfoListPtr ret = FileInfoListPtr(new FileInfoList()); + +- FileInfoList::iterator i, iend; ++ FileInfoList::const_iterator i, iend; + iend = mFileList.end(); + for(i = mFileList.begin(); i != iend; ++i) { + if(StringUtil::match(i->filename, pattern, true)) +--- a/src/openalsoundsystem.cpp ++++ b/src/openalsoundsystem.cpp +@@ -35,16 +35,16 @@ + #include "playlist.h" + #include "mpakogre.h" + +-template<> OpenALSoundSystem* Singleton<OpenALSoundSystem>::ms_Singleton = 0; ++template<> OpenALSoundSystem* Singleton<OpenALSoundSystem>::msSingleton = 0; + + OpenALSoundSystem* OpenALSoundSystem::getSingletonPtr() { +- return ms_Singleton; ++ return msSingleton; + } + + + OpenALSoundSystem& OpenALSoundSystem::getSingleton() { +- assert(ms_Singleton); +- return *ms_Singleton; ++ assert(msSingleton); ++ return *msSingleton; + } + + +--- a/src/objectsystem.cpp ++++ b/src/objectsystem.cpp +@@ -26,7 +26,7 @@ + #include "objectsystem.h" + #include "game.h" + +-template<> ObjectSystem* Singleton<ObjectSystem>::ms_Singleton = 0; ++template<> ObjectSystem* Singleton<ObjectSystem>::msSingleton = 0; + + + // ObjectSystem constructor +@@ -135,11 +135,11 @@ void ObjectSystem::findFreePosition(Vect + + + ObjectSystem *ObjectSystem::getSingletonPtr() { +- return ms_Singleton; ++ return msSingleton; + } + + ObjectSystem &ObjectSystem::getSingleton() { +- assert(ms_Singleton); +- return *ms_Singleton; ++ assert(msSingleton); ++ return *msSingleton; + } + +--- a/src/scriptsystem.cpp ++++ b/src/scriptsystem.cpp +@@ -38,7 +38,7 @@ + #include "mpakogre.h" + #include <vector> + +-template<> ScriptSystem* Singleton<ScriptSystem>::ms_Singleton = 0; ++template<> ScriptSystem* Singleton<ScriptSystem>::msSingleton = 0; + + + // Log error messages +@@ -564,12 +564,12 @@ bool ScriptSystem::executeScript(const c + + + ScriptSystem *ScriptSystem::getSingletonPtr() { +- return ms_Singleton; ++ return msSingleton; + } + + ScriptSystem &ScriptSystem::getSingleton() { +- assert(ms_Singleton); +- return *ms_Singleton; ++ assert(msSingleton); ++ return *msSingleton; + } + + Modified: packages/trunk/funguloids/debian/patches/series =================================================================== --- packages/trunk/funguloids/debian/patches/series 2013-06-07 04:41:29 UTC (rev 14235) +++ packages/trunk/funguloids/debian/patches/series 2013-06-07 08:57:56 UTC (rev 14236) @@ -9,3 +9,4 @@ g++4.7.patch doc_path.patch libs_lua5.1.patch +ogre-1.8.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
