117 lines
5.7 KiB
Diff
117 lines
5.7 KiB
Diff
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/libslic3r/PrintBase.cpp OrcaSlicer-2.0.0/src/libslic3r/PrintBase.cpp
|
|
--- OrcaSlicer-2.0.0.orig/src/libslic3r/PrintBase.cpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/libslic3r/PrintBase.cpp 2024-06-26 12:47:29.755499011 +0200
|
|
@@ -79,7 +79,7 @@
|
|
cfg.opt_string("input_filename_base") + default_ext :
|
|
this->placeholder_parser().process(format, 0, &cfg);
|
|
if (filename.extension().empty())
|
|
- filename = boost::filesystem::change_extension(filename, default_ext);
|
|
+ filename.replace_extension(default_ext);
|
|
return filename.string();
|
|
} catch (std::runtime_error &err) {
|
|
throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what());
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/libslic3r/Utils.hpp OrcaSlicer-2.0.0/src/libslic3r/Utils.hpp
|
|
--- OrcaSlicer-2.0.0.orig/src/libslic3r/Utils.hpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/libslic3r/Utils.hpp 2024-06-26 12:48:46.302368118 +0200
|
|
@@ -15,7 +15,10 @@
|
|
|
|
#include <boost/system/error_code.hpp>
|
|
#include <boost/algorithm/string.hpp>
|
|
+#include <boost/filesystem.hpp>
|
|
#include <boost/filesystem/path.hpp>
|
|
+#include <boost/nowide/cstdio.hpp>
|
|
+#include <boost/nowide/fstream.hpp>
|
|
#include <boost/date_time.hpp>
|
|
#include "boost/date_time/posix_time/ptime.hpp"
|
|
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/Config/Version.cpp OrcaSlicer-2.0.0/src/slic3r/Config/Version.cpp
|
|
--- OrcaSlicer-2.0.0.orig/src/slic3r/Config/Version.cpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/slic3r/Config/Version.cpp 2024-06-26 12:47:29.755499011 +0200
|
|
@@ -3,6 +3,7 @@
|
|
#include <cctype>
|
|
|
|
#include <boost/filesystem/operations.hpp>
|
|
+#include <boost/filesystem/directory.hpp>
|
|
#include <boost/nowide/fstream.hpp>
|
|
|
|
#include "libslic3r/libslic3r.h"
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/AuxiliaryDataViewModel.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
|
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/AuxiliaryDataViewModel.cpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/AuxiliaryDataViewModel.cpp 2024-06-26 12:47:29.758832352 +0200
|
|
@@ -337,7 +337,7 @@
|
|
dir_path += "\\" + src_bfs_path.filename().generic_wstring();
|
|
|
|
boost::system::error_code ec;
|
|
- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec))
|
|
+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec))
|
|
continue;
|
|
|
|
// Update model data
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/HttpServer.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/HttpServer.hpp
|
|
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/HttpServer.hpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/HttpServer.hpp 2024-06-26 12:47:29.758832352 +0200
|
|
@@ -10,6 +10,7 @@
|
|
#include <boost/beast/version.hpp>
|
|
#include <boost/asio.hpp>
|
|
#include <boost/thread.hpp>
|
|
+#include <boost/log/trivial.hpp>
|
|
#include <string>
|
|
#include <memory>
|
|
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.cpp
|
|
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.cpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.cpp 2024-06-26 12:47:29.758832352 +0200
|
|
@@ -40,7 +40,7 @@
|
|
|
|
// Setup auth server to receive OAuth code from callback url
|
|
local_authorization_server.set_request_handler([this, queue](const std::string& url) -> std::shared_ptr<HttpServer::Response> {
|
|
- if (boost::contains(url, "/callback")) {
|
|
+ if (boost::algorithm::contains(url, "/callback")) {
|
|
const auto code = url_get_param(url, "code");
|
|
const auto state = url_get_param(url, "state");
|
|
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.hpp
|
|
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.hpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.hpp 2024-06-26 12:47:29.758832352 +0200
|
|
@@ -3,6 +3,7 @@
|
|
|
|
#include "Job.hpp"
|
|
#include "slic3r/GUI/HttpServer.hpp"
|
|
+#include <boost/algorithm/string.hpp>
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/OAuthDialog.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/OAuthDialog.hpp
|
|
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/OAuthDialog.hpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/OAuthDialog.hpp 2024-06-26 12:47:29.758832352 +0200
|
|
@@ -4,6 +4,7 @@
|
|
#include "GUI_Utils.hpp"
|
|
#include "Jobs/OAuthJob.hpp"
|
|
#include "Jobs/Worker.hpp"
|
|
+#include <boost/log/trivial.hpp>
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/RemovableDriveManager.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/RemovableDriveManager.cpp
|
|
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/RemovableDriveManager.cpp 2024-03-30 03:10:30.000000000 +0100
|
|
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/RemovableDriveManager.cpp 2024-06-26 12:47:29.758832352 +0200
|
|
@@ -21,8 +21,8 @@
|
|
#include <glob.h>
|
|
#include <pwd.h>
|
|
#include <boost/filesystem.hpp>
|
|
+#include <boost/filesystem/path.hpp>
|
|
#include <boost/system/error_code.hpp>
|
|
-#include <boost/filesystem/convenience.hpp>
|
|
#include <boost/process.hpp>
|
|
#endif
|
|
|
|
@@ -202,7 +202,7 @@
|
|
stat(path.c_str(), &buf);
|
|
uid_t uid = buf.st_uid;
|
|
if (getuid() == uid)
|
|
- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path });
|
|
+ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path });
|
|
}
|
|
}
|
|
}
|