diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
commit | 4187bba080530c5ca1c7dae9c233e88f3fc8f535 (patch) | |
tree | b6f535e053876097ced1b6bda14a4da890c730d4 /media-gfx/superslicer | |
parent | 2a8d2f71d1d9963368e0ef3d641d75979a689d12 (diff) |
gentoo auto-resync : 06:07:2024 - 08:06:15
Diffstat (limited to 'media-gfx/superslicer')
10 files changed, 0 insertions, 660 deletions
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 510268033bd0..5b63186e3475 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,11 +1,3 @@ -AUX superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch 2581 BLAKE2B 8c2ec83db05e97949aa9fb43d3980748be1324cb2ac90c8caec45b772fb2bad34f56365381bb371d0094079b42065a65c00595388ec861e127b846e6859a0281 SHA512 6f454745d8f84dbcded092a1a16b2903757b36d76888a4c40e1f019f75ba6bea9b245c980347cc7feb0a9bdd22e8eb4e4b12e639594f1fe6e928eea5298081ec -AUX superslicer-2.5.59.0-boost.patch 9423 BLAKE2B 8e797ed961fe2c1c8f0b5e67b6aaee8efa17933cecd190b1623e7df4f2724edb4e1c6559a839c4dc1d3b67f8f9db080476640e48187a03ec0541114863cdffc6 SHA512 f72eb91230c0e3aa2254533e5377a6aedcd806529c0cf3795eee883d4b8aaf6c618c7f2e064e80de3f688bf9f2a97d913e72d0b1c227d64caa7585cad1c97a84 -AUX superslicer-2.5.59.0-cereal.patch 1974 BLAKE2B b28be995a1c258c1848ad78a00061c73ccb173da0f790573273123f8f1481131a75ec3fb84fd8cee26dc7cef750650c827b39b685343d9defd44edec48e698a6 SHA512 50510b349f43354da7a5712d662b94a0276081c9af28d04b8d63885ed0053b52522b686ecfffa45d0b197097ee7c08ea1c831f0995a337c44becd453c392a539 -AUX superslicer-2.5.59.0-dont-install-bundled-angelscript.patch 1671 BLAKE2B 211bbd88a3db29312bfd1b0a7fac23ade2fb1e38c99cd1c7125e2c5d5fda46adc2cb232345085783e37404c6fbc10cb831196b546ca3a76f4d59d8095f254f54 SHA512 a206103eac2969e68540d564149e843a24a16445b6157fc3409ff1c577657d35ef05493259e3fc3615d641eaad96832231aa969c53eaac87e11d1b365ffd99b1 -AUX superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch 690 BLAKE2B 410f71260334643bf53c0095d59f1090d8c7619502a32e319a6beb3f23937edd7d1c07eeab0fa9d332b8151b32605c8711492bf66b43c2fd64c85e19e54edaef SHA512 122d52d1f43aaedeee8d0ce56c5daef22f904de03101669fb9a870c18d1ea73615c2ec37da3de65f1f8d2a7455517111f75aeaadd60f66c82edebf288bc4767f -AUX superslicer-2.5.59.0-missing-includes.patch 1225 BLAKE2B 0d9cfbd9dfaf6e066a4206ff7bfa88cfe92c96e102ac2105a4a4fb5288b15a878969bcd00719d89a917fd3216b42aaba3688b6ad8a6b597eeed58d4c6a26de05 SHA512 cee42f67820a0fb98f1bdbbdf160bafcfaf1d1f87dbf85dc73781e8911b4ee76697996bdc23b9acc2c502701053587ce3d9a71d301ccb2bf9ee27e010a8bd855 -AUX superslicer-2.5.59.0-openexr3.patch 2361 BLAKE2B d351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779 SHA512 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb -AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c3703628beb2e90d06ec4d85b982cd137e005eb4542aae308140c21b3b6fb1c72c07dd3e90e38668d6c2a69df054bdd414c43b9f8fcea57f SHA512 495d8d62c8cdf4ff9a075366dbc2db5c80a1c99bcd23172db9cf64dd649d70acbca44182722a71d790feb84c9a67a81403d75ff33b77444a1251b1f45f7b4b9e AUX superslicer-2.5.59.2-boost.patch 12899 BLAKE2B 53cfab69e12af506c276fcc34851c62deba2c4ef5682176977ed1b07a60c1967264f56752f0c286aeb059fa7924272fa5d837c8c2add768590dd9604444705fe SHA512 798a275a6b310e6fa16e630a841fc3198fc287fa1ac9de0fc70a41effadd30b10887fed969ab59e73993c9ca1830ac1a8e633bbeaf0560a9225d0c5f1b00eab3 AUX superslicer-2.5.59.2-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38 AUX superslicer-2.5.59.2-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868 @@ -17,10 +9,7 @@ AUX superslicer-2.5.59.2-missing-includes-fix.patch 3042 BLAKE2B bc0d9e39abd204f AUX superslicer-2.5.59.2-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb AUX superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5 AUX superslicer-2.5.59.2-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339 -DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76 -DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e SHA512 c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd -EBUILD superslicer-2.5.59.0-r3.ebuild 2294 BLAKE2B f7bbe1b0cfeeaf1b95495b8cdbbc128786286a430d6d5908f8abca08c08788443ae274b2d181e63d67b5c65f9cb2e799681f5dd44ef912a63dcdb5420154941a SHA512 b8f7563a780dd62255abc62fb88df9a7fa0547fd0acbbc1c5b603f5236175027e0d6291f15d8d8dcf1a86e21a7bf26e1f54b2b04b57dc5add23c2e4c42cb8724 EBUILD superslicer-2.5.59.2-r2.ebuild 2490 BLAKE2B 5f1775a715b74a581daec55361e3c0b813d09e6e46fb47c27e680f0f739a822c9669fe7dc0e49b35365f78bde93ae5f112446580c058f56f17297d4e010f1f2b SHA512 febd71376f386a2c6b6cbd2f39b7f58e86f607475d33c9792bf099f195a1c6a0971b24b76dff8615e1bce2713c334ba702b78bff0e810dce5db85fbf5a464704 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331 diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch deleted file mode 100644 index 1cb0d9f1afff..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:21:43.583075853 +1100 -+++ b/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:23:03.902694287 +1100 -@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog - if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos) - m_valid_suffix = recent_path.substr(extension_start); - // .gcode suffix control -- auto validate_path = [this](const wxString &path) -> bool { -- if (! path.Lower().EndsWith(m_valid_suffix.Lower())) { -+ auto validate_path = [this](const std::wstring &path) -> bool { -+ if (! wxString(path).Lower().EndsWith(m_valid_suffix.Lower())) { - MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO); - if (msg_wingow.ShowModal() == wxID_NO) - return false; -@@ -90,7 +90,7 @@ PrintHostSendDialog::PrintHostSendDialog - - auto* btn_ok = add_button(wxID_OK, true, _L("Upload")); - btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { -- if (validate_path(txt_filename->GetValue())) { -+ if (validate_path(txt_filename->GetValue().ToStdWstring())) { - post_upload_action = PrintHostPostUploadAction::None; - EndDialog(wxID_OK); - } -@@ -100,7 +100,7 @@ PrintHostSendDialog::PrintHostSendDialog - if (post_actions.has(PrintHostPostUploadAction::StartPrint)) { - auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print")); - btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { -- if (validate_path(txt_filename->GetValue())) { -+ if (validate_path(txt_filename->GetValue().ToStdWstring())) { - post_upload_action = PrintHostPostUploadAction::StartPrint; - EndDialog(wxID_OK); - } -@@ -111,7 +111,7 @@ PrintHostSendDialog::PrintHostSendDialog - // Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here. - auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate")); - btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { -- if (validate_path(txt_filename->GetValue())) { -+ if (validate_path(txt_filename->GetValue().ToStdWstring())) { - post_upload_action = PrintHostPostUploadAction::StartSimulation; - EndDialog(wxID_OK); - } 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); diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch deleted file mode 100644 index 6557d6653640..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 549d06f0d..bffb63d9b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -496,6 +496,9 @@ endif () - - # Find the Cereal serialization library - find_package(cereal REQUIRED) -+if (NOT TARGET cereal::cereal) -+ add_library(cereal::cereal ALIAS cereal) -+endif () - - # l10n - set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ec44417fa..9aae6dc11 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -141,7 +141,7 @@ if (NOT WIN32) - set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}") - endif () - --target_link_libraries(Slic3r libslic3r cereal) -+target_link_libraries(Slic3r libslic3r cereal::cereal) - if (APPLE) - # add_compile_options(-stdlib=libc++) - # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) -diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt -index c8f22a482..832149338 100644 ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -399,7 +399,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS}) - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ cereal::cereal - libigl - miniz - boost_libs -diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index f71b809b3..c64a2c5a9 100644 ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3 - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch deleted file mode 100644 index 603a96ac67a5..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/src/angelscript/CMakeLists.txt b/src/angelscript/CMakeLists.txt -index fed80a0ad..a65d9f8d5 100644 ---- a/src/angelscript/CMakeLists.txt -+++ b/src/angelscript/CMakeLists.txt -@@ -202,48 +202,3 @@ endif() - - # Don't override the default runtime output path to avoid conflicts when building for multiple target platforms - #set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) -- --#See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages for a detailed explanation about this part --install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -- INCLUDES DESTINATION include --) -- --install(FILES -- ${CMAKE_CURRENT_SOURCE_DIR}/include/angelscript.h -- DESTINATION include -- COMPONENT Devel --) -- --include(CMakePackageConfigHelpers) --write_basic_package_version_file( -- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" -- VERSION ${PROJECT_VERSION} -- COMPATIBILITY AnyNewerVersion --) -- --export(EXPORT AngelscriptTargets -- FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake" -- NAMESPACE Angelscript:: --) --configure_file(cmake/AngelscriptConfig.cmake -- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake" -- COPYONLY --) -- --set(ConfigPackageLocation lib/cmake/Angelscript) --install(EXPORT AngelscriptTargets -- FILE AngelscriptTargets.cmake -- NAMESPACE Angelscript:: -- DESTINATION ${ConfigPackageLocation} --) --install( -- FILES -- cmake/AngelscriptConfig.cmake -- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" -- DESTINATION ${ConfigPackageLocation} -- COMPONENT Devel --) -- diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch deleted file mode 100644 index 5a5c9960cc00..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9aae6dc11..75835903e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -299,5 +299,5 @@ else () - install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - - # Install the symlink for gcodeviewer -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") - endif () diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch deleted file mode 100644 index 27f29fa9f6f1..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp -index 18dc7396e..95483e844 100644 ---- a/src/libslic3r/AppConfig.cpp -+++ b/src/libslic3r/AppConfig.cpp -@@ -1,6 +1,7 @@ - #include <boost/filesystem.hpp> - #include "libslic3r/libslic3r.h" - #include "libslic3r/Utils.hpp" -+#include "libslic3r/I18N.hpp" - #include "AppConfig.hpp" - #include "Exception.hpp" - #include "LocalesUtils.hpp" -diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp -index d7401f3fb..a95b7749d 100644 ---- a/src/libslic3r/PerimeterGenerator.hpp -+++ b/src/libslic3r/PerimeterGenerator.hpp -@@ -1,6 +1,7 @@ - #ifndef slic3r_PerimeterGenerator_hpp_ - #define slic3r_PerimeterGenerator_hpp_ - -+#include "ClipperUtils.hpp" - #include "libslic3r.h" - #include <vector> - #include "ExPolygonCollection.hpp" -diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -index be157eafa..d63eb110e 100644 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -@@ -40,6 +40,7 @@ - #include <wx/odcombo.h> - #include <wx/textctrl.h> - #include <wx/wrapsizer.h> -+#include <wx/rawbmp.h> - #include "wxExtensions.hpp" - - #include <boost/filesystem/path.hpp> diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch deleted file mode 100644 index 8ae71c13f4d3..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake -index 4fde5fa4a..566e73a5e 100644 ---- a/cmake/modules/FindOpenVDB.cmake -+++ b/cmake/modules/FindOpenVDB.cmake -@@ -347,28 +347,10 @@ macro(just_fail msg) - return() - endmacro() - --find_package(IlmBase QUIET) --if(NOT IlmBase_FOUND) -- pkg_check_modules(IlmBase QUIET IlmBase) --endif() --if (IlmBase_FOUND AND NOT TARGET IlmBase::Half) -- message(STATUS "Falling back to IlmBase found by pkg-config...") -- -- find_library(IlmHalf_LIBRARY NAMES Half) -- if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS) -- just_fail("IlmBase::Half can not be found!") -- endif() -- -- add_library(IlmBase::Half UNKNOWN IMPORTED) -- set_target_properties(IlmBase::Half PROPERTIES -- IMPORTED_LOCATION "${IlmHalf_LIBRARY}" -- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}") --elseif(NOT IlmBase_FOUND) -- just_fail("IlmBase::Half can not be found!") --endif() - find_package(TBB ${_quiet} ${_required} COMPONENTS tbb) - find_package(ZLIB ${_quiet} ${_required}) - find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system ) -+find_package(Imath CONFIG) - - # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to - # which we can query for optional deps. This basically runs ldd/otoll/objdump -@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST}) - set(OpenVDB_USES_LOG4CPLUS ON) - endif() - -- string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP) -+ string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP) - if(NOT ${_HAS_DEP} EQUAL -1) - set(OpenVDB_USES_ILM ON) - endif() -@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS) - find_package(Log4cplus ${_quiet} ${_required}) - endif() - --if(OpenVDB_USES_ILM) -- find_package(IlmBase ${_quiet} ${_required}) --endif() -- --if(OpenVDB_USES_EXR) -+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR) - find_package(OpenEXR ${_quiet} ${_required}) - endif() - -@@ -471,7 +449,7 @@ endif() - set(_OPENVDB_VISIBLE_DEPENDENCIES - Boost::iostreams - Boost::system -- IlmBase::Half -+ Imath::Imath - ) - - set(_OPENVDB_DEFINITIONS) -@@ -481,10 +459,7 @@ endif() - - if(OpenVDB_USES_EXR) - list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES -- IlmBase::IlmThread -- IlmBase::Iex -- IlmBase::Imath -- OpenEXR::IlmImf -+ OpenEXR::OpenEXR - ) - list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR") - endif() diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch deleted file mode 100644 index abe4d7bf60cc..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp -index ccd3cc083..be8bbe5cd 100644 ---- a/src/slic3r/GUI/GUI.cpp -+++ b/src/slic3r/GUI/GUI.cpp -@@ -33,6 +33,16 @@ class AppConfig; - - namespace GUI { - -+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702 -+#ifdef __WXGTK3__ -+struct ForceX11 { -+ ForceX11() { -+ setenv("GDK_BACKEND", "x11", 1); -+ } -+}; -+static struct ForceX11 forcex11; -+#endif -+ - #if __APPLE__ - IOPMAssertionID assertionID; - #endif diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild deleted file mode 100644 index 7cdeaa9cc284..000000000000 --- a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" -MY_PN="SuperSlicer" -SLICER_PROFILES_COMMIT="748fbdfd2ac077e4e415868e7bc963740b92aa8e" - -inherit cmake wxwidgets xdg flag-o-matic - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="https://github.com/supermerill/SuperSlicer/" -SRC_URI=" - https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz -" - -LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="test" - -RESTRICT="test" - -# No dep on sci-libs/libigl, in-tree version cannot build -# static library currently. Using bundled one. -RDEPEND=" - dev-cpp/eigen:3 - dev-cpp/tbb:= - dev-libs/boost:=[nls] - dev-libs/cereal - dev-libs/expat - dev-libs/glib:2 - dev-libs/gmp:= - dev-libs/mpfr:= - dev-libs/imath:= - >=media-gfx/openvdb-8.2:= - net-misc/curl[adns] - media-libs/glew:0= - media-libs/libpng:0= - media-libs/qhull:= - sci-libs/nlopt - >=sci-mathematics/cgal-5.0:= - sys-apps/dbus - sys-libs/zlib:= - virtual/glu - virtual/opengl - x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] -" -DEPEND="${RDEPEND} - media-libs/qhull[static-libs] -" - -PATCHES=( - "${FILESDIR}/${P}-openexr3.patch" - "${FILESDIR}/${P}-wxgtk3-wayland.patch" - "${FILESDIR}/${P}-cereal.patch" - "${FILESDIR}/${P}-boost.patch" - "${FILESDIR}/${P}-boost-1.81-std-wxString-to-std-wstring.patch" - "${FILESDIR}/${P}-missing-includes.patch" - "${FILESDIR}/${P}-dont-install-bundled-angelscript.patch" - "${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch" -) - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_unpack() { - default - - mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die -} - -src_configure() { - CMAKE_BUILD_TYPE="Release" - - append-flags -fno-strict-aliasing - - setup-wxwidgets - - local mycmakeargs=( - -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" - - -DSLIC3R_BUILD_TESTS=$(usex test) - -DSLIC3R_FHS=ON - -DSLIC3R_GTK=3 - -DSLIC3R_GUI=ON - -DSLIC3R_PCH=OFF - -DSLIC3R_STATIC=OFF - -DSLIC3R_WX_STABLE=ON - -Wno-dev - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die -} |