diff options
Diffstat (limited to 'media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch')
| -rw-r--r-- | media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch | 256 |
1 files changed, 0 insertions, 256 deletions
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch deleted file mode 100644 index 4f847aaacb92..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp -index 7c8029cde..4791f0612 100644 ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -9,7 +9,7 @@ - - bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data) - { -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app); -+ boost::nowide::ofstream file(path.string(), std::ios_base::app); - for (const auto& element : data) - { - //Example of .pot element -diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp -index f029b3d72..18dc7396e 100644 ---- a/src/libslic3r/AppConfig.cpp -+++ b/src/libslic3r/AppConfig.cpp -@@ -1,3 +1,4 @@ -+#include <boost/filesystem.hpp> - #include "libslic3r/libslic3r.h" - #include "libslic3r/Utils.hpp" - #include "AppConfig.hpp" -diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp -index d811ddcc2..1a7023061 100644 ---- a/src/libslic3r/AppConfig.hpp -+++ b/src/libslic3r/AppConfig.hpp -@@ -5,6 +5,7 @@ - #include <map> - #include <string> - -+#include <boost/filesystem/path.hpp> - #include <boost/algorithm/string/trim_all.hpp> - - #include "libslic3r/Config.hpp" -diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp -index 5bf520568..7b870520b 100644 ---- a/src/libslic3r/LocalesUtils.cpp -+++ b/src/libslic3r/LocalesUtils.cpp -@@ -1,3 +1,4 @@ -+#include <boost/lexical_cast.hpp> - #include "LocalesUtils.hpp" - - #ifdef _WIN32 -diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp -index 9e9fcda4f..d889e2abf 100644 ---- a/src/libslic3r/Preset.cpp -+++ b/src/libslic3r/Preset.cpp -@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree) - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all) - { - ptree tree; -- boost::filesystem::ifstream ifs(path); -+ boost::nowide::ifstream ifs(path.string()); - boost::property_tree::read_ini(ifs, tree); - return VendorProfile::from_ini(tree, path, load_all); - } -diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp -index f525c9837..839f0f5e9 100644 ---- a/src/libslic3r/Utils.hpp -+++ b/src/libslic3r/Utils.hpp -@@ -7,6 +7,7 @@ - #include <type_traits> - #include <system_error> - -+#include <boost/filesystem.hpp> - #include <boost/system/error_code.hpp> - - #include "libslic3r.h" -diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -index 89212f27f..be157eafa 100644 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -@@ -18,6 +18,11 @@ - #include <wx/notebook.h> - #include "Notebook.hpp" - -+#include <boost/filesystem.hpp> -+#include <boost/property_tree/ptree.hpp> -+#include <boost/property_tree/ini_parser.hpp> -+#include <boost/log/trivial.hpp> -+ - #include "MainFrame.hpp" - #include "wxExtensions.hpp" - -diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -index fcb7472e6..866ebaef5 100644 ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -14,6 +14,7 @@ - #include <boost/log/trivial.hpp> - #include <boost/dll/runtime_symbol_info.hpp> - #include <boost/algorithm/string/replace.hpp> -+#include <boost/nowide/fstream.hpp> - - #include <wx/filename.h> - #include <wx/stattext.h> -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog() - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ -diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp -index 271e3ef2d..6bbdf3907 100644 ---- a/src/slic3r/GUI/FreeCADDialog.cpp -+++ b/src/slic3r/GUI/FreeCADDialog.cpp -@@ -38,6 +38,7 @@ - #include <boost/log/trivial.hpp> - #include <boost/property_tree/ptree.hpp> - #include <boost/property_tree/json_parser.hpp> -+#include <boost/nowide/fstream.hpp> - - // hack for process.hpp : it uses pid_t to set it as alias of int, but vc_x64_lib (wx thingy) as a '#define pid_t int' - // and so boost/process has a line 'typedef int int'instead of 'typedef int pid_t' that makes it crash -@@ -322,7 +323,7 @@ bool FreeCADDialog::load_text_from_file(const boost::filesystem::path &path) { - try { - std::locale loc = boost::locale::generator()("en_US.UTF-8"); - // Open the stream to 'lock' the file. -- boost::filesystem::ifstream in; -+ boost::nowide::ifstream in; - in.imbue(loc); - in.open(path); - // Obtain the size of the file. -@@ -369,7 +370,7 @@ bool FreeCADDialog::write_text_in_file(const wxString &towrite, const boost::fil - boost::filesystem::create_directories(file.parent_path()); - std::locale loc = boost::locale::generator()("en_US.UTF-8"); - // Open the stream to 'lock' the file. -- boost::filesystem::ofstream out; -+ boost::nowide::ofstream out; - out.imbue(loc); - out.open(file); - out << towrite; -diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp -index 4cf21a36c..75b2a8e94 100644 ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -19,6 +19,7 @@ - #include <boost/lexical_cast.hpp> - #include <boost/log/trivial.hpp> - #include <boost/nowide/convert.hpp> -+#include <boost/nowide/fstream.hpp> - - #include <wx/stdpaths.h> - #include <wx/imagpng.h> -diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp -index 32916303f..3a984bf38 100644 ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -14,12 +14,14 @@ - #include "libslic3r/Config.hpp" - #include "libslic3r/PrintConfig.hpp" - -+#include <map> -+ - #include <boost/algorithm/string/replace.hpp> - #include <boost/filesystem.hpp> - #include <boost/nowide/fstream.hpp> - #include <boost/log/trivial.hpp> - #include <boost/property_tree/ini_parser.hpp> --#include <map> -+ - #include <cereal/archives/binary.hpp> - #include <cereal/types/string.hpp> - #include <cereal/types/vector.hpp> -@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f - - void write_used_binary(const std::vector<std::string>& ids) - { -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary); - cereal::BinaryOutputArchive archive(file); - HintsCerealData cd { ids }; - try -@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids) - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string(); - return; - } -- boost::filesystem::ifstream file(path); -+ boost::nowide::ifstream file(path.string()); - cereal::BinaryInputArchive archive(file); - HintsCerealData cd; - try -diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp -index ffc600b0e..c8080d112 100644 ---- a/src/slic3r/GUI/Preferences.cpp -+++ b/src/slic3r/GUI/Preferences.cpp -@@ -12,6 +12,7 @@ - #include "OG_CustomCtrl.hpp" - #include "wxExtensions.hpp" - -+#include <boost/algorithm/string/split.hpp> - #include <boost/filesystem.hpp> - #include <boost/filesystem/path.hpp> - -diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp -index 4565d1aec..6738cada9 100644 ---- a/src/slic3r/GUI/ScriptExecutor.cpp -+++ b/src/slic3r/GUI/ScriptExecutor.cpp -@@ -4,6 +4,13 @@ - #include "Tab.hpp" - #include "libslic3r/PresetBundle.hpp" - #include "libslic3r/Print.hpp" -+#include <boost/log/trivial.hpp> -+#include <boost/lexical_cast.hpp> -+#include <boost/algorithm/string/trim_all.hpp> -+#include <boost/algorithm/string/erase.hpp> -+#include <boost/algorithm/string/split.hpp> -+#include <boost/filesystem.hpp> -+#include <boost/filesystem/string_file.hpp> - - #include <string> - -diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp -index 173f0f762..a3eb553c8 100644 ---- a/src/slic3r/GUI/Tab.cpp -+++ b/src/slic3r/GUI/Tab.cpp -@@ -36,6 +36,8 @@ - #include <boost/filesystem.hpp> - #include <boost/filesystem/path.hpp> - #include <boost/lexical_cast.hpp> -+#include <boost/nowide/fstream.hpp> -+#include <boost/log/trivial.hpp> - - #include "wxExtensions.hpp" - #include "PresetComboBoxes.hpp" -@@ -1692,7 +1694,7 @@ std::vector<Slic3r::GUI::PageShp> Tab::create_pages(std::string setting_type_nam - - //read file - //std::ifstream filestream(ui_layout_file.c_str()); -- boost::filesystem::ifstream filestream(ui_layout_file); -+ boost::nowide::ifstream filestream(ui_layout_file); - std::string full_line; - while (std::getline(filestream, full_line)) { - //remove spaces -diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp -index 9bab91860..47568721a 100644 ---- a/src/slic3r/Utils/Http.cpp -+++ b/src/slic3r/Utils/Http.cpp -@@ -11,6 +11,7 @@ - #include <boost/filesystem.hpp> - #include <boost/format.hpp> - #include <boost/log/trivial.hpp> -+#include <boost/nowide/fstream.hpp> - - #include <curl/curl.h> - -@@ -52,7 +53,7 @@ namespace Slic3r { - % error; - }) - .on_complete([&](std::string body, unsigned /* http_status */) { -- boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc); -+ boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc); - file.write(body.c_str(), body.size()); - file.close(); - boost::filesystem::rename(tmp_path, target_path); |