r12637 - in packages/trunk/plee-the-bear/debian: . patches
Julien Jorge
j-jorge-guest at alioth.debian.org
Mon Aug 22 21:47:19 UTC 2011
Author: j-jorge-guest
Date: 2011-08-22 21:47:18 +0000 (Mon, 22 Aug 2011)
New Revision: 12637
Added:
packages/trunk/plee-the-bear/debian/patches/boost-1.46.diff
packages/trunk/plee-the-bear/debian/patches/compile-with-g++4.6.diff
Modified:
packages/trunk/plee-the-bear/debian/changelog
packages/trunk/plee-the-bear/debian/control
packages/trunk/plee-the-bear/debian/patches/series
Log:
* Compiles with g++ 4.6.
* Fix FTBFS with Boost 1.46. Thanks to Konstantinos Margaritis.
(Closes: #627253).
* Bump standard version to 3.9.2.
Modified: packages/trunk/plee-the-bear/debian/changelog
===================================================================
--- packages/trunk/plee-the-bear/debian/changelog 2011-08-22 20:36:52 UTC (rev 12636)
+++ packages/trunk/plee-the-bear/debian/changelog 2011-08-22 21:47:18 UTC (rev 12637)
@@ -1,10 +1,13 @@
-plee-the-bear (0.5.1-1.1) unstable; urgency=low
+plee-the-bear (0.5.1-2) unstable; urgency=low
- * Non-maintainer upload.
* Use the findpackage command to find libclaw, according to the new
installation path of the CMake module of the library.
+ * Compiles with g++ 4.6.
+ * Fix FTBFS with Boost 1.46. Thanks to Konstantinos Margaritis.
+ (Closes: #627253).
+ * Bump standard version to 3.9.2.
- -- Julien Jorge <julien.jorge at gamned.org> Sun, 21 Aug 2011 16:59:22 +0200
+ -- Julien Jorge <julien.jorge at gamned.org> Sun, 21 Aug 2011 18:07:35 +0200
plee-the-bear (0.5.1-1) unstable; urgency=low
Modified: packages/trunk/plee-the-bear/debian/control
===================================================================
--- packages/trunk/plee-the-bear/debian/control 2011-08-22 20:36:52 UTC (rev 12636)
+++ packages/trunk/plee-the-bear/debian/control 2011-08-22 21:47:18 UTC (rev 12637)
@@ -12,7 +12,7 @@
libclaw-configuration-file-dev (>= 1.6.0), libclaw-net-dev (>= 1.6.0),
libwxgtk2.8-dev (>= 2.8), gettext (>= 0.17)
Build-Conflicts: wx2.6-headers
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://plee-the-bear.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/plee-the-bear/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/plee-the-bear/?op=log
Added: packages/trunk/plee-the-bear/debian/patches/boost-1.46.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/boost-1.46.diff (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/boost-1.46.diff 2011-08-22 21:47:18 UTC (rev 12637)
@@ -0,0 +1,297 @@
+Index: plee-the-bear-0.5.1/bear-engine/core/src/engine/code/game_local_client.cpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-engine/core/src/engine/code/game_local_client.cpp 2011-08-21 17:37:46.000000000 +0200
++++ plee-the-bear-0.5.1/bear-engine/core/src/engine/code/game_local_client.cpp 2011-08-21 17:38:00.000000000 +0200
+@@ -359,7 +359,11 @@
+
+ if ( !result.empty() )
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path( result, boost::filesystem::native );
++#else
++ boost::filesystem::path path( result );
++#endif
+ path /= name;
+ result = path.string();
+ }
+@@ -478,13 +482,22 @@
+ */
+ std::string bear::engine::game_local_client::get_game_directory() const
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path dir
+ (claw::system_info::get_user_directory(), boost::filesystem::native);
++#else
++ boost::filesystem::path dir
++ (claw::system_info::get_user_directory());
++#endif
+
+ std::string result;
+ std::string subdir = '.' + get_game_name_as_filename();
+
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ dir /= boost::filesystem::path(subdir, boost::filesystem::native);
++#else
++ dir /= boost::filesystem::path(subdir);
++#endif
+
+ if ( create_game_directory(dir.string()) )
+ result = dir.string();
+@@ -504,7 +517,11 @@
+ ( const std::string& dir ) const
+ {
+ bool result = false;
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path( dir, boost::filesystem::native );
++#else
++ boost::filesystem::path path( dir );
++#endif
+
+ if ( boost::filesystem::exists( path ) )
+ result = boost::filesystem::is_directory( path );
+Index: plee-the-bear-0.5.1/bear-engine/core/src/engine/code/resource_pool.cpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-engine/core/src/engine/code/resource_pool.cpp 2011-08-21 17:37:46.000000000 +0200
++++ plee-the-bear-0.5.1/bear-engine/core/src/engine/code/resource_pool.cpp 2011-08-21 17:38:00.000000000 +0200
+@@ -137,7 +137,11 @@
+ const std::string filepath =
+ *it + boost::filesystem::slash<boost::filesystem::path>::value + name;
+ #endif
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ const boost::filesystem::path path( filepath, boost::filesystem::native );
++#else
++ const boost::filesystem::path path( filepath );
++#endif
+
+ if ( boost::filesystem::exists( path ) )
+ if ( !boost::filesystem::is_directory( path ) )
+Index: plee-the-bear-0.5.1/bear-factory/animation-editor/src/bf/code/configuration.cpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-factory/animation-editor/src/bf/code/configuration.cpp 2011-08-21 17:37:46.000000000 +0200
++++ plee-the-bear-0.5.1/bear-factory/animation-editor/src/bf/code/configuration.cpp 2011-08-21 17:38:00.000000000 +0200
+@@ -116,10 +116,16 @@
+ {
+ bool result = false;
+
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path
+ ( path_configuration::get_instance().get_config_directory()
+ + s_config_file_name,
+ boost::filesystem::native );
++#else
++ boost::filesystem::path path
++ ( path_configuration::get_instance().get_config_directory()
++ + s_config_file_name );
++#endif
+
+ if ( !boost::filesystem::exists( path ) )
+ {
+Index: plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2011-08-21 17:37:46.000000000 +0200
++++ plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2011-08-21 17:38:00.000000000 +0200
+@@ -130,7 +130,11 @@
+ */
+ bool bf::path_configuration::get_full_path( std::string& p ) const
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path( p, boost::filesystem::native );
++#else
++ boost::filesystem::path path( p );
++#endif
+ bool result = boost::filesystem::exists( path );
+ std::list<std::string>::const_reverse_iterator it;
+
+@@ -191,14 +195,22 @@
+ */
+ bool bf::path_configuration::get_relative_path( std::string& p ) const
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path( p, boost::filesystem::native );
++#else
++ boost::filesystem::path path( p );
++#endif
+ bool result = false;
+ std::list<std::string>::const_reverse_iterator it;
+
+ for (it=data_path.rbegin(); !result && (it!=data_path.rend()); ++it)
+ {
+ bool stop(false);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path data( *it, boost::filesystem::native );
++#else
++ boost::filesystem::path data( *it );
++#endif
+ boost::filesystem::path::iterator pit = path.begin();
+ boost::filesystem::path::iterator dit = data.begin();
+
+@@ -214,13 +226,20 @@
+ if ( dit == data.end() )
+ {
+ result = true;
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ p = *pit;
++#else
++ p = pit->string();
++#endif
+ for ( ++pit; pit!=path.end(); ++pit )
+ #if BOOST_VERSION / 100 % 1000 < 34
+- p += '/' + *pit;
+-#else
++ p += '/' + pit->string();
++#elif BOOST_VERSION / 100 % 1000 < 44
+ p +=
+ boost::filesystem::slash<boost::filesystem::path>::value + *pit;
++#else
++ p +=
++ boost::filesystem::slash<boost::filesystem::path>::value + pit->string();
+ #endif
+ }
+ }
+@@ -277,8 +296,12 @@
+ {
+ bool result = false;
+
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path
+ ( get_config_directory(), boost::filesystem::native );
++#else
++ boost::filesystem::path path ( get_config_directory() );
++#endif
+
+ if ( boost::filesystem::exists( path ) )
+ result = boost::filesystem::is_directory( path );
+@@ -299,9 +322,13 @@
+
+ if ( create_config_directory() )
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path
+ ( get_config_directory() + s_config_file_name,
+ boost::filesystem::native );
++#else
++ boost::filesystem::path path ( get_config_directory() + s_config_file_name );
++#endif
+
+ if ( !boost::filesystem::exists( path ) )
+ {
+@@ -398,7 +425,11 @@
+ for (it=data_path.begin(); (it!=data_path.end()) && (candidates.size() < m);
+ ++it)
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ const boost::filesystem::path dirpath( *it, boost::filesystem::native );
++#else
++ const boost::filesystem::path dirpath( *it );
++#endif
+
+ if ( boost::filesystem::exists( dirpath ) )
+ if ( boost::filesystem::is_directory( dirpath ) )
+@@ -445,13 +476,18 @@
+ ( const std::string& dirname, const std::string& pattern, std::size_t offset,
+ std::size_t m, std::list<std::string>& result ) const
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ const boost::filesystem::path path( dirname, boost::filesystem::native );
++#else
++ const boost::filesystem::path path( dirname );
++#endif
+
+ CLAW_PRECOND( boost::filesystem::is_directory(path) );
+
+ boost::filesystem::directory_iterator it(path);
+ const boost::filesystem::directory_iterator eit;
+
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ for ( ; (it!=eit) && (result.size() < m); ++it )
+ if ( boost::filesystem::is_directory(*it) )
+ {
+@@ -460,6 +496,16 @@
+ }
+ else if ( glob_match(pattern, it->string(), offset) )
+ result.push_back(it->string());
++#else
++ for ( ; (it!=eit) && (result.size() < m); ++it )
++ if ( boost::filesystem::is_directory(*it) )
++ {
++ if ( glob_potential_match(pattern, it->path().string(), offset) )
++ find_all_files_in_dir(it->path().string(), pattern, offset, m, result);
++ }
++ else if ( glob_match(pattern, it->path().string(), offset) )
++ result.push_back(it->path().string());
++#endif
+ } // path_configuration::find_all_files_in_dir()
+
+ /*----------------------------------------------------------------------------*/
+Index: plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp 2011-08-21 17:37:46.000000000 +0200
++++ plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp 2011-08-21 17:38:00.000000000 +0200
+@@ -46,7 +46,11 @@
+ ( const std::string& dir, Func& f, Iterator first_ext, Iterator last_ext )
+ {
+ std::queue<boost::filesystem::path> pending;
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path(dir, boost::filesystem::native);
++#else
++ boost::filesystem::path path(dir);
++#endif
+
+ if ( !boost::filesystem::exists(path) )
+ return;
+@@ -64,8 +68,13 @@
+ for ( ; it!=eit; ++it)
+ if ( boost::filesystem::is_directory(*it) )
+ pending.push(*it);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ else if (supported_extension( it->string(), first_ext, last_ext ))
+ f(it->string());
++#else
++ else if (supported_extension( it->path().string(), first_ext, last_ext ))
++ f(it->path().string());
++#endif
+ }
+ } // scan_dir::operator()
+
+Index: plee-the-bear-0.5.1/bear-factory/level-editor/src/bf/code/configuration.cpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-factory/level-editor/src/bf/code/configuration.cpp 2011-08-21 17:37:46.000000000 +0200
++++ plee-the-bear-0.5.1/bear-factory/level-editor/src/bf/code/configuration.cpp 2011-08-21 17:38:00.000000000 +0200
+@@ -151,10 +151,16 @@
+ {
+ bool result = false;
+
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path
+ ( path_configuration::get_instance().get_config_directory()
+ + s_config_file_name,
+ boost::filesystem::native );
++#else
++ boost::filesystem::path path
++ ( path_configuration::get_instance().get_config_directory()
++ + s_config_file_name );
++#endif
+
+ if ( !boost::filesystem::exists( path ) )
+ {
+Index: plee-the-bear-0.5.1/bear-factory/model-editor/src/bf/code/configuration.cpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-factory/model-editor/src/bf/code/configuration.cpp 2011-08-21 17:37:46.000000000 +0200
++++ plee-the-bear-0.5.1/bear-factory/model-editor/src/bf/code/configuration.cpp 2011-08-21 17:38:00.000000000 +0200
+@@ -124,10 +124,16 @@
+ {
+ bool result = false;
+
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+ boost::filesystem::path path
+ ( path_configuration::get_instance().get_config_directory()
+ + s_config_file_name,
+ boost::filesystem::native );
++#else
++ boost::filesystem::path path
++ ( path_configuration::get_instance().get_config_directory()
++ + s_config_file_name );
++#endif
+
+ if ( !boost::filesystem::exists( path ) )
+ {
Added: packages/trunk/plee-the-bear/debian/patches/compile-with-g++4.6.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/compile-with-g++4.6.diff (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/compile-with-g++4.6.diff 2011-08-22 21:47:18 UTC (rev 12637)
@@ -0,0 +1,49 @@
+Index: plee-the-bear-0.5.1/bear-engine/core/src/text_interface/method_caller_implement.hpp
+===================================================================
+--- plee-the-bear-0.5.1.orig/bear-engine/core/src/text_interface/method_caller_implement.hpp 2011-08-21 17:07:22.000000000 +0200
++++ plee-the-bear-0.5.1/bear-engine/core/src/text_interface/method_caller_implement.hpp 2011-08-21 17:08:39.000000000 +0200
+@@ -102,6 +102,9 @@
+ class caller_type:
+ public typed_method_caller<SelfClass>
+ {
++ public:
++ caller_type() { }
++
+ private:
+ void explicit_execute
+ ( SelfClass& self, const std::vector<std::string>& args,
+@@ -137,6 +140,9 @@
+ class caller_type:
+ public typed_method_caller<SelfClass>
+ {
++ public:
++ caller_type() { }
++
+ private:
+ void explicit_execute
+ ( SelfClass& self, const std::vector<std::string>& args,
+@@ -172,6 +178,9 @@
+ class caller_type:
+ public typed_method_caller<SelfClass>
+ {
++ public:
++ caller_type() { }
++
+ private:
+ void explicit_execute
+ ( SelfClass& self, const std::vector<std::string>& args,
+@@ -207,6 +216,9 @@
+ class caller_type:
+ public typed_method_caller<SelfClass>
+ {
++ public:
++ caller_type() { }
++
+ private:
+ void explicit_execute
+ ( SelfClass& self, const std::vector<std::string>& args,
+@@ -231,3 +243,4 @@
+ #include "text_interface/impl/method_caller_implement.tpp"
+
+ #endif // __TEXT_INTERFACE_METHOD_CALLER_IMPLEMENT_HPP__
++
Modified: packages/trunk/plee-the-bear/debian/patches/series
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/series 2011-08-22 20:36:52 UTC (rev 12636)
+++ packages/trunk/plee-the-bear/debian/patches/series 2011-08-22 21:47:18 UTC (rev 12637)
@@ -1,3 +1,5 @@
+compile-with-g++4.6.diff
use-findpackage-for-libclaw.diff
do-not-install-authors-files.diff
editors-default-dir.diff
+boost-1.46.diff
More information about the Pkg-games-commits
mailing list