Your message dated Sat, 20 Aug 2011 22:03:52 +0000
with message-id <e1qutdw-0004l0...@franck.debian.org>
and subject line Bug#629838: fixed in smc 1.9-4
has caused the Debian Bug report #629838,
regarding smc: FTBFS with Boost 1.46 [PATCH]
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
629838: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629838
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: smc
Version: 1.9-3
Severity: normal
Tags: patch
SMC fails to build with the new Boost 1.46 packages [1]. The attached
patch fixes the build on both old and new boost versions.
The changes are actually listed here:
http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/deprecated.html
Regards
Konstantinos
[1]:
http://buildd.debian-ports.org/status/fetch.php?pkg=smc&arch=armhf&ver=1.9-3%2Bb1&stamp=1304120136
(armhf is a new port so I had to build most packages with the new
boost libs, hence the error appeared there first).
diff -ruN smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new//src/core/filesystem/filesystem.cpp
--- smc-1.9/src/core/filesystem/filesystem.cpp 2009-07-04 10:11:18.000000000 +0000
+++ smc-1.9.new//src/core/filesystem/filesystem.cpp 2011-06-08 04:07:04.889984136 +0000
@@ -64,7 +64,11 @@
bool Dir_Exists( const std::string &dir )
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
return fs::exists( fs::path( dir, fs::native ) );
+#else
+ return fs::exists( fs::path( dir.c_str() ) );
+#endif
/*struct stat file_info;
@@ -89,7 +93,11 @@
bool Create_Directory( const std::string &dir )
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
return fs::create_directory( fs::path( dir, fs::native ) );
+#else
+ return fs::create_directory( fs::path( dir.c_str() ) );
+#endif
}
size_t Get_File_Size( const std::string &filename )
@@ -130,7 +138,11 @@
{
vector<std::string> valid_files;
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fs::path full_path( dir, fs::native );
+#else
+ fs::path full_path( dir.c_str() );
+#endif
fs::directory_iterator end_iter;
// load all available objects
@@ -142,32 +154,56 @@
if( fs::is_directory( *dir_itr ) )
{
// ignore hidden directories
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
if( dir_itr->path().leaf().find( "." ) == 0 )
+#else
+ if( dir_itr->path().filename().string().find( "." ) == 0 )
+#endif
{
continue;
}
if( with_directories )
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
+#else
+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
+#endif
}
// load all items from the sub-directory
if( search_in_sub_directories )
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
+#else
+ vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories );
+#endif
valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
}
}
// valid file
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
+#else
+ else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos )
+#endif
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
+#else
+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
+#endif
}
}
catch( const std::exception &ex )
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() );
+#else
+ printf( "%s %s\n", dir_itr->path().filename().string().c_str(), ex.what() );
+#endif
}
}
diff -ruN smc-1.9/src/overworld/world_manager.cpp smc-1.9.new//src/overworld/world_manager.cpp
--- smc-1.9/src/overworld/world_manager.cpp 2009-08-16 16:44:52.000000000 +0000
+++ smc-1.9.new//src/overworld/world_manager.cpp 2011-06-08 13:51:15.159979826 +0000
@@ -111,14 +111,22 @@
void cOverworld_Manager :: Load_Dir( const std::string &dir, bool user_dir /* = 0 */ )
{
// set world directory
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fs::path full_path( dir, fs::native );
+#else
+ fs::path full_path( dir.c_str() );
+#endif
fs::directory_iterator end_iter;
for( fs::directory_iterator dir_itr( full_path ); dir_itr != end_iter; ++dir_itr )
{
try
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
std::string current_dir = dir_itr->path().leaf();
+#else
+ std::string current_dir = dir_itr->path().filename().string();
+#endif
// only directories with an existing description
if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
diff -ruN smc-1.9/src/video/video.cpp smc-1.9.new//src/video/video.cpp
--- smc-1.9/src/video/video.cpp 2009-07-04 09:46:56.000000000 +0000
+++ smc-1.9.new//src/video/video.cpp 2011-06-08 14:02:49.359979740 +0000
@@ -749,7 +749,11 @@
{
try
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fs::remove_all( fs::path( m_imgcache_dir, fs::native ) );
+#else
+ fs::remove_all( fs::path( m_imgcache_dir.c_str() ) );
+#endif
}
// could happen if a file is locked or we have no write rights
catch( const std::exception &ex )
@@ -771,7 +775,11 @@
// no cache available
if( !Dir_Exists( imgcache_dir_active ) )
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR, fs::native ) );
+#else
+ fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR ) );
+#endif
}
// cache available
else
--- End Message ---
--- Begin Message ---
Source: smc
Source-Version: 1.9-4
We believe that the bug you reported is fixed in the latest version of
smc, which is due to be installed in the Debian FTP archive:
smc-data_1.9-4_all.deb
to main/s/smc/smc-data_1.9-4_all.deb
smc-music_1.9-4_all.deb
to main/s/smc/smc-music_1.9-4_all.deb
smc_1.9-4.debian.tar.gz
to main/s/smc/smc_1.9-4.debian.tar.gz
smc_1.9-4.dsc
to main/s/smc/smc_1.9-4.dsc
smc_1.9-4_amd64.deb
to main/s/smc/smc_1.9-4_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 629...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Muammar El Khatib <muam...@debian.org> (supplier of updated smc package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 20 Aug 2011 20:18:07 +0200
Source: smc
Binary: smc smc-data smc-music
Architecture: source all amd64
Version: 1.9-4
Distribution: unstable
Urgency: low
Maintainer: Muammar El Khatib <muam...@debian.org>
Changed-By: Muammar El Khatib <muam...@debian.org>
Description:
smc - Jump and Run game like Super Mario World
smc-data - levels and game data for Secret Maryo Chronicles
smc-music - music files for Secret Maryo Chronicles
Closes: 556349 629838
Changes:
smc (1.9-4) unstable; urgency=low
.
* Switch to dpkg-source 3.0 (quilt) format.
* Bumped standards version to 3.9.1. No changes were needed in order to
* All needed libraries to the linker when building smc were added. With this
change smc should build correctly with binutils-gold. Thanks to Mahyuddin
Susanto for providing a patch. (Closes: #556349)
* SMC is now able to compile with Boost 1.46. Thanks to Konstantinos
Margaritis for providing a patch. It was also needed to add the next to the
debian/rules:
LDFLAGS = -lboost_system
(Closes: 629838)
* Maintainer's mail has been changed.
Checksums-Sha1:
ac47e0cadce38579a4762487d8f449a204aff21a 1186 smc_1.9-4.dsc
dab82a280662be032974df2804f29768d86140f8 11035 smc_1.9-4.debian.tar.gz
b7a5a37d6a438789c5137be56be50d2a41354944 48511676 smc-data_1.9-4_all.deb
698b1db6a09209bc1a027b9b4988df18bf9ae2fb 36585786 smc-music_1.9-4_all.deb
5ee643e38858d73339ee8373bd0cafc0bd08f220 710668 smc_1.9-4_amd64.deb
Checksums-Sha256:
48eb8c635f11a8eb8fbd2e624af1e075f1a9c0e700775210ffe018fa166bc740 1186
smc_1.9-4.dsc
2df437f58c8690111c55366d0f06a0b1557deefb461cd120c73f46b89fb367c8 11035
smc_1.9-4.debian.tar.gz
c974d86b95befe8d0690df2864df1d588a97b26520eef72eb78abc8ada486fd7 48511676
smc-data_1.9-4_all.deb
002541ab803b40608c8c813dfd045691119cbdb27429208eba7476c3de7d6f45 36585786
smc-music_1.9-4_all.deb
f6ccaff87306ca52857df07c88c5425673ec63e2d4a16a121b85d92387ddcd7d 710668
smc_1.9-4_amd64.deb
Files:
f7311d8d15cdf8a7663abb0ea9ffce5e 1186 games optional smc_1.9-4.dsc
5869e49cc56376c531ea6e8bbcd76486 11035 games optional smc_1.9-4.debian.tar.gz
a77c32649456b01b524391d49f040a71 48511676 games optional smc-data_1.9-4_all.deb
f6c5bd44f2b0bb44a53223424203f59a 36585786 games optional
smc-music_1.9-4_all.deb
78794758d5f3244204b25cd53a1c6585 710668 games optional smc_1.9-4_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEARECAAYFAk5QKkEACgkQMOtAOxJwKfEwXgCdFVCeI6kZ7R+yPZa915PUhAu+
aGkAoJFPDGwrUGR9JyjRUjkpezAAtDK6
=JTwM
-----END PGP SIGNATURE-----
--- End Message ---
