diff options
author | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-07-15 15:45:11 -0300 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-07-15 15:45:11 -0300 |
commit | a8a2c7388922e286a6aa4bbd388a128aef9c720b (patch) | |
tree | f006a9dc2d339114c45814001d85906b00369bbb /libre/blender-libre/boost-1.50.patch | |
parent | de9ab185a1c49d54b0ab5cee79f016d663d90b10 (diff) | |
download | abslibre-a8a2c7388922e286a6aa4bbd388a128aef9c720b.tar.gz abslibre-a8a2c7388922e286a6aa4bbd388a128aef9c720b.tar.bz2 abslibre-a8a2c7388922e286a6aa4bbd388a128aef9c720b.zip |
blender-libre: updating package
Diffstat (limited to 'libre/blender-libre/boost-1.50.patch')
-rw-r--r-- | libre/blender-libre/boost-1.50.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch new file mode 100644 index 000000000..fa698a3a6 --- /dev/null +++ b/libre/blender-libre/boost-1.50.patch @@ -0,0 +1,42 @@ +diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp +--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300 +@@ -26,8 +26,6 @@ + #include "util_path.h" + #include "util_types.h" + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include <boost/filesystem.hpp> + #include <boost/algorithm/string.hpp> + +@@ -117,7 +115,7 @@ + boost::filesystem::directory_iterator it(dir), it_end; + + for(; it != it_end; it++) { +- string filename = it->path().filename(); ++ string filename = it->path().filename().string(); + + if(boost::starts_with(filename, name)) + if(except.find(filename) == except.end()) +diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp +--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300 +@@ -26,8 +26,6 @@ + + #include <stdio.h> + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include <boost/filesystem.hpp> + #include <boost/algorithm/string.hpp> + +@@ -60,7 +58,7 @@ + + string path_filename(const string& path) + { +- return boost::filesystem::path(path).filename(); ++ return boost::filesystem::path(path).filename().string(); + } + + string path_dirname(const string& path) |