Author: jwrdegoede Update of /cvs/free/rpms/smc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21623 Modified Files: smc.spec Added Files: smc-1.9-boost-filesystem-v3.patch Log Message: * Thu Feb 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; - 1.9-7 - rebuild for new libboost smc-1.9-boost-filesystem-v3.patch: smc-1.9.new/src/utilities.o |only smc-1.9.new/src/vector.o |only smc-1.9.new/src/video/video.cpp | 4 ++-- src/core/filesystem/filesystem.cpp | 18 +++++++++--------- src/overworld/world_manager.cpp | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) --- NEW FILE smc-1.9-boost-filesystem-v3.patch --- --- smc-1.9/src/core/filesystem/filesystem.cpp 2009-07-04 12:11:18.000000000 +0200 +++ smc-1.9.new/src/core/filesystem/filesystem.cpp 2011-02-10 13:00:42.310260022 +0100 @@ -64,7 +64,7 @@ bool Dir_Exists( const std::string &dir ) { - return fs::exists( fs::path( dir, fs::native ) ); + return fs::exists( fs::path( dir ) ); /*struct stat file_info; @@ -89,7 +89,7 @@ bool Create_Directory( const std::string &dir ) { - return fs::create_directory( fs::path( dir, fs::native ) ); + return fs::create_directory( fs::path( dir ) ); } size_t Get_File_Size( const std::string &filename ) @@ -130,7 +130,7 @@ { vector<std::string> valid_files; - fs::path full_path( dir, fs::native ); + fs::path full_path( dir ); fs::directory_iterator end_iter; // load all available objects @@ -142,32 +142,32 @@ if( fs::is_directory( *dir_itr ) ) { // ignore hidden directories - if( dir_itr->path().leaf().find( "." ) == 0 ) + if( dir_itr->path().filename().native().find( "." ) == 0 ) { continue; } if( with_directories ) { - valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); + valid_files.push_back( dir_itr->path().native() ); } // load all items from the sub-directory if( search_in_sub_directories ) { - vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories ); + vector<std::string> new_valid_files = Get_Directory_Files( dir_itr->path().native(), file_type, with_directories ); valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() ); } } // valid file - else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos ) + else if( file_type.empty() || dir_itr->path().filename().native().rfind( file_type ) != std::string::npos ) { - valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); + valid_files.push_back( dir_itr->path().native() ); } } catch( const std::exception &ex ) { - printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() ); + printf( "%s %s\n", dir_itr->path().filename().c_str(), ex.what() ); } } --- smc-1.9/src/overworld/world_manager.cpp 2009-08-16 18:44:52.000000000 +0200 +++ smc-1.9.new/src/overworld/world_manager.cpp 2011-02-10 13:04:19.029260001 +0100 @@ -111,14 +111,14 @@ void cOverworld_Manager :: Load_Dir( const std::string &dir, bool user_dir /* = 0 */ ) { // set world directory - fs::path full_path( dir, fs::native ); + fs::path full_path( dir ); fs::directory_iterator end_iter; for( fs::directory_iterator dir_itr( full_path ); dir_itr != end_iter; ++dir_itr ) { try { - std::string current_dir = dir_itr->path().leaf(); + std::string current_dir = dir_itr->path().filename().native(); // only directories with an existing description if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) ) @@ -145,7 +145,7 @@ } catch( const std::exception &ex ) { - printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() ); + printf( "%s %s\n", dir_itr->path().filename().c_str(), ex.what() ); } } } Only in smc-1.9.new/src: utilities.o Only in smc-1.9.new/src: vector.o diff -ur smc-1.9/src/video/video.cpp smc-1.9.new/src/video/video.cpp --- smc-1.9/src/video/video.cpp 2011-02-10 13:06:45.880260001 +0100 +++ smc-1.9.new/src/video/video.cpp 2011-02-10 13:06:25.319259961 +0100 @@ -735,7 +735,7 @@ { try { - fs::remove_all( fs::path( m_imgcache_dir, fs::native ) ); + fs::remove_all( fs::path( m_imgcache_dir ) ); } // could happen if a file is locked or we have no write rights catch( const std::exception &ex ) @@ -757,7 +757,7 @@ // no cache available if( !Dir_Exists( imgcache_dir_active ) ) { - fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR, fs::native ) ); + fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR ) ); } // cache available else Index: smc.spec =================================================================== RCS file: /cvs/free/rpms/smc/devel/smc.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- smc.spec 6 Jan 2011 08:50:47 -0000 1.14 +++ smc.spec 10 Feb 2011 20:45:10 -0000 1.15 @@ -1,6 +1,6 @@ Name: smc Version: 1.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: 2D platform game that uses OpenGL in a style similar to Super Mario Group: Amusements/Games License: GPLv3 @@ -12,10 +12,12 @@ Patch0: http://repo.calcforge.org/temp/smc-1.9-fix-implicit-linking.patch # patch from upstream forum Patch1: smc-fixes-for-cegui-v0-7.diff +# submitted upstream +Patch2: smc-1.9-boost-filesystem-v3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel BuildRequires: gettext-devel -BuildRequires: boost-devel >= 1.31 +BuildRequires: boost-devel >= 1.46 BuildRequires: cegui-devel >= 0.7 BuildRequires: libGLU-devel BuildRequires: pkgconfig >= 0.9.0 @@ -40,6 +42,7 @@ sed -i 's/\r//' docs/style.css docs/*.html docs/*.txt %patch0 -p1 -b .patch0 %patch1 -p1 -b .cegui07 +%patch2 -p1 %build @@ -115,6 +118,9 @@ %changelog +* Thu Feb 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; - 1.9-7 +- rebuild for new libboost + * Mon Jan 3 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.9-6 - rebuild for new cegui