--- Begin Message ---
Source: plee-the-bear
Version: 0.5.1-1
Severity: important
Tags: patch
According to
http://buildd.debian-ports.org/status/fetch.php?pkg=plee-the-bear&arch=armhf&ver=0.5.1-1%2Bb1&stamp=1303399989
This package fails to build with the new boost 1.46.
The attached patch enables the build with both 1.42 and 1.46 versions
of boost.
Regards
Konstantinos
-- System Information:
Debian Release: squeeze/sid
Architecture: armhf (armv7l)
Kernel: Linux 2.6.31.14-efikamx (PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -ruN plee-the-bear-0.5.1/bear-engine/core/src/engine/code/game_local_client.cpp plee-the-bear-0.5.1.new//bear-engine/core/src/engine/code/game_local_client.cpp
--- plee-the-bear-0.5.1/bear-engine/core/src/engine/code/game_local_client.cpp 2010-11-15 21:18:54.000000000 +0000
+++ plee-the-bear-0.5.1.new//bear-engine/core/src/engine/code/game_local_client.cpp 2011-04-29 07:17:20.677297985 +0000
@@ -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 );
diff -ruN plee-the-bear-0.5.1/bear-engine/core/src/engine/code/resource_pool.cpp plee-the-bear-0.5.1.new//bear-engine/core/src/engine/code/resource_pool.cpp
--- plee-the-bear-0.5.1/bear-engine/core/src/engine/code/resource_pool.cpp 2010-02-21 16:11:08.000000000 +0000
+++ plee-the-bear-0.5.1.new//bear-engine/core/src/engine/code/resource_pool.cpp 2011-04-29 07:22:47.387298480 +0000
@@ -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 ) )
diff -ruN plee-the-bear-0.5.1/bear-factory/animation-editor/src/bf/code/configuration.cpp plee-the-bear-0.5.1.new//bear-factory/animation-editor/src/bf/code/configuration.cpp
--- plee-the-bear-0.5.1/bear-factory/animation-editor/src/bf/code/configuration.cpp 2010-02-21 16:11:08.000000000 +0000
+++ plee-the-bear-0.5.1.new//bear-factory/animation-editor/src/bf/code/configuration.cpp 2011-04-29 08:22:47.597297734 +0000
@@ -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 ) )
{
diff -ruN plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp plee-the-bear-0.5.1.new//bear-factory/bear-editor/src/bf/code/path_configuration.cpp
--- plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2010-09-18 20:36:46.000000000 +0000
+++ plee-the-bear-0.5.1.new//bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2011-04-29 09:05:54.907298734 +0000
@@ -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
}
}
@@ -256,6 +275,15 @@
data_path.push_back(*it);
}
}
+
+ if ( item_class_path.empty() )
+ {
+ item_class_path.push_back("/usr/share/bear-factory/item-description");
+ item_class_path.push_back("/usr/share/bear-factory/plee-the-bear/item-description");
+ }
+
+ if ( data_path.empty() )
+ data_path.push_back("/usr/share/games/plee-the-bear/");
} // path_configuration::load()
/*----------------------------------------------------------------------------*/
@@ -268,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 );
@@ -290,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 ) )
{
@@ -389,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 ) )
@@ -436,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) )
{
@@ -451,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()
/*----------------------------------------------------------------------------*/
diff -ruN plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp plee-the-bear-0.5.1.new//bear-factory/bear-editor/src/bf/impl/scan_dir.tpp
--- plee-the-bear-0.5.1/bear-factory/bear-editor/src/bf/impl/scan_dir.tpp 2010-02-21 16:11:08.000000000 +0000
+++ plee-the-bear-0.5.1.new//bear-factory/bear-editor/src/bf/impl/scan_dir.tpp 2011-04-29 08:05:27.377298230 +0000
@@ -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()
diff -ruN plee-the-bear-0.5.1/bear-factory/level-editor/src/bf/code/configuration.cpp plee-the-bear-0.5.1.new//bear-factory/level-editor/src/bf/code/configuration.cpp
--- plee-the-bear-0.5.1/bear-factory/level-editor/src/bf/code/configuration.cpp 2010-02-21 16:11:08.000000000 +0000
+++ plee-the-bear-0.5.1.new//bear-factory/level-editor/src/bf/code/configuration.cpp 2011-04-29 08:25:22.877298732 +0000
@@ -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 ) )
{
diff -ruN plee-the-bear-0.5.1/bear-factory/model-editor/src/bf/code/configuration.cpp plee-the-bear-0.5.1.new//bear-factory/model-editor/src/bf/code/configuration.cpp
--- plee-the-bear-0.5.1/bear-factory/model-editor/src/bf/code/configuration.cpp 2010-02-21 16:11:08.000000000 +0000
+++ plee-the-bear-0.5.1.new//bear-factory/model-editor/src/bf/code/configuration.cpp 2011-04-29 08:40:37.167297859 +0000
@@ -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 ) )
{
diff -ruN plee-the-bear-0.5.1/plee-the-bear/data/CMakeLists.txt plee-the-bear-0.5.1.new//plee-the-bear/data/CMakeLists.txt
--- plee-the-bear-0.5.1/plee-the-bear/data/CMakeLists.txt 2010-11-21 14:24:51.000000000 +0000
+++ plee-the-bear-0.5.1.new//plee-the-bear/data/CMakeLists.txt 2011-04-29 07:02:16.066189742 +0000
@@ -25,6 +25,7 @@
PATTERN "*.gz" EXCLUDE
PATTERN "*.bz2" EXCLUDE
PATTERN "README" EXCLUDE
+ PATTERN "AUTHORS" EXCLUDE
)
install(
--- End Message ---
signature.asc
