+++ /dev/null
---- src/overworld/world_manager.cpp.old 2012-11-14 17:05:19.759087973 +0100
-+++ src/overworld/world_manager.cpp 2012-11-14 17:06:55.365644219 +0100
-@@ -111,14 +111,14 @@
- void cOverworld_Manager :: Load_Dir( const std::string &dir, bool user_dir /* = 0 */ ) \r
- {\r
- // set world directory\r
-- fs::path full_path( dir, fs::native );\r
-+ fs::path full_path( dir );\r
- fs::directory_iterator end_iter;\r
- \r
- for( fs::directory_iterator dir_itr( full_path ); dir_itr != end_iter; ++dir_itr )\r
- {\r
- try\r
- {\r
-- std::string current_dir = dir_itr->path().leaf();\r
-+ std::string current_dir = dir_itr->path().filename().string();\r
- \r
- // only directories with an existing description\r
- if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )\r
---- src/video/video.cpp.old 2012-11-14 17:10:26.448625365 +0100
-+++ src/video/video.cpp 2012-11-14 17:11:37.486580531 +0100
-@@ -749,7 +749,7 @@
- {\r
- try\r
- {\r
-- fs::remove_all( fs::path( m_imgcache_dir, fs::native ) );\r
-+ fs::remove_all( fs::path( m_imgcache_dir ) );\r
- }\r
- // could happen if a file is locked or we have no write rights\r
- catch( const std::exception &ex )\r
-@@ -771,7 +771,7 @@
- // no cache available\r
- if( !Dir_Exists( imgcache_dir_active ) )\r
- {\r
-- fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR, fs::native ) );\r
-+ fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR ) );\r
- }\r
- // cache available\r
- else\r
---- src/core/filesystem/filesystem.cpp.old 2012-11-14 09:00:41.965617165 +0100
-+++ src/core/filesystem/filesystem.cpp 2012-11-14 16:57:11.282043980 +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,27 +142,27 @@
- if( fs::is_directory( *dir_itr ) )
- {
- // ignore hidden directories
-- if( dir_itr->path().leaf().find( "." ) == 0 )
-+ if( dir_itr->path().filename().string().find( "." ) == 0 )
- {
- continue;
- }
-
- if( with_directories )
- {
-- valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- }
-
- // 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 + "/" + dir_itr->path().filename().string(), 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().string().rfind( file_type ) != std::string::npos )
- {
-- valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- }
- }
- catch( const std::exception &ex )
+++ /dev/null
-diff -burN smc-1.9.orig/configure.ac smc-1.9/configure.ac
---- smc-1.9.orig/configure.ac 2013-10-23 19:11:08.635054067 +0200
-+++ smc-1.9/configure.ac 2013-10-23 19:42:29.820272295 +0200
-@@ -12,6 +12,10 @@
- ### Check for libraries ###
-
- # Check for the Boost Filesystem library
-+AC_CHECK_LIB(boost_system, main, ,
-+ AC_MSG_ERROR([Unable to find Boost System library]))
-+
-+# Check for the Boost Filesystem library
- AC_CHECK_LIB(boost_filesystem, main, ,
- AC_MSG_ERROR([Unable to find Boost Filesystem library]))
-
-@@ -36,6 +40,10 @@
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
-
-+# Check for the X11 library
-+AC_CHECK_LIB(X11, XOpenDisplay, ,
-+ AC_MSG_ERROR([X11 library not found]))
-+
- # Check for the libpng library
- AC_CHECK_LIB(png, png_init_io, ,
- AC_MSG_ERROR([libpng library not found]))
+++ /dev/null
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic games
-
-MUSIC_P=SMC_Music_4.1_high
-DESCRIPTION="Secret Maryo Chronicles"
-HOMEPAGE="http://www.secretmaryo.org/"
-SRC_URI="mirror://sourceforge/smclone/${P}.tar.bz2
- music? ( mirror://sourceforge/smclone/${MUSIC_P}.zip )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="music"
-
-RDEPEND="<dev-games/cegui-0.7[opengl,devil]
- dev-libs/boost
- virtual/opengl
- virtual/glu
- x11-libs/libX11
- dev-libs/libpcre[unicode]
- media-libs/libpng:0
- media-libs/libsdl[X,joystick,opengl]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[vorbis]
- media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- music? ( app-arch/unzip )"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- cd "${S}"
- use music && unpack ${MUSIC_P}.zip
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-boost150.patch \
- "${FILESDIR}"/${P}-underlink.patch
- eautoreconf
-}
-
-src_install() {
- default
- newicon data/icon/window_32.png smc.png
- make_desktop_entry ${PN} "Secret Maryo Chronicles"
- doman makefiles/unix/man/smc.6
- dodoc docs/*.txt
- dohtml docs/{*.css,*.html}
- prepgamesdirs
-}
projects / gentoo.git / commitdiff