Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=d47ddf2fa49f9457606a0534c88781fc6c4be72f
commit d47ddf2fa49f9457606a0534c88781fc6c4be72f Author: James Buren <[email protected]> Date: Thu Nov 29 03:33:41 2012 -0600 violetland-0.4.3-3-x86_64 * rebuild with libboost * add workaround for broken patching diff --git a/source/games-extra/violetland/FrugalBuild b/source/games-extra/violetland/FrugalBuild index a795e1a..1fdc177 100644 --- a/source/games-extra/violetland/FrugalBuild +++ b/source/games-extra/violetland/FrugalBuild @@ -3,23 +3,27 @@ pkgname=violetland pkgver=0.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="Game where a girl, Violet, struggles with hordes of monsters." depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'libglu' 'libsm' 'libxext' 'libstdc++' \ - 'libxfixes' 'libuuid' 'libboost>=1.49.0') + 'libxfixes' 'libuuid' 'libboost>=1.51.0') makedepends=('boost') _F_googlecode_sep="-v" _F_googlecode_ext="-src.zip" Finclude googlecode cmake +source=(${source[@]} boost) groups=('games-extra') archs=('i686' 'x86_64') _F_cd_path="$pkgname-v$pkgver" -sha1sums=('9aaf2cfd2ba33c935d3f1ee9f0c2f87718d01d4b') +sha1sums=('9aaf2cfd2ba33c935d3f1ee9f0c2f87718d01d4b' \ + 'b1da9078d657338abcd989900ca21b74e74fe696') build() { Fcd Finstallrel 644 $pkgname.desktop usr/share/applications/$pkgname.desktop Finstallrel 644 icon-light.png usr/share/pixmaps/$pkgname.png + Fcd + patch -Np1 --binary < ../boost || Fdie CMake_build } diff --git a/source/games-extra/violetland/boost b/source/games-extra/violetland/boost new file mode 100644 index 0000000..024135c --- /dev/null +++ b/source/games-extra/violetland/boost @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a92cb27..f130fd0 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ find_package(SDL_ttf REQUIRED) + find_package(SDL_mixer REQUIRED) + find_package(OpenGL REQUIRED) + find_package(Boost COMPONENTS filesystem system REQUIRED) +-add_definitions(-DBOOST_FILESYSTEM_VERSION=2) ++add_definitions(-DBOOST_FILESYSTEM_VERSION=3) + + if(${MINGW}) + set(INTL_LIBRARY intl) +diff --git a/src/system/utility/FileUtility.cpp b/src/system/utility/FileUtility.cpp +index 52091b3..3f20887 100644 +--- a/src/system/utility/FileUtility.cpp ++++ b/src/system/utility/FileUtility.cpp +@@ -20,7 +20,7 @@ std::vector<std::string> FileUtility::getFilesFromDir(boost::filesystem::path di + + while (dir_it != boost::filesystem::directory_iterator()) { + if (boost::filesystem::is_regular_file(*dir_it)) +- files.push_back(dir_it->filename()); ++ files.push_back(dir_it->path().filename().string()); + ++dir_it; + } + return files; +@@ -32,8 +32,8 @@ std::vector<std::string> FileUtility::getSubDirsFromDir(boost::filesystem::path + + while (dir_it != boost::filesystem::directory_iterator()) { + if (boost::filesystem::is_directory(*dir_it)) +- if (dir_it->path().filename()[0] != '.') +- subDirs.push_back(dir_it->path().filename()); ++ if (dir_it->path().filename().string()[0] != '.') ++ subDirs.push_back(dir_it->path().filename().string()); + ++dir_it; + } + return subDirs; +@@ -45,7 +45,7 @@ unsigned int FileUtility::getSubDirsCountFromDir(boost::filesystem::path dir) { + + while (dir_it != boost::filesystem::directory_iterator()) { + if (boost::filesystem::is_directory(*dir_it)) +- if (dir_it->path().filename()[0] != '.') ++ if (dir_it->path().filename().string()[0] != '.') + ++count; + ++dir_it; + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
