From d7ef5a07f47da6898dcb2d1503790c59b0470571 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Dec 2022 20:13:26 +0000 Subject: gentoo auto-resync : 28:12:2022 - 20:13:25 --- media-gfx/superslicer/Manifest | 12 +- ...perslicer-2.4.58.3-AppConfig-include-I18N.patch | 12 - ....3-CreateMMUTiledCanvas-include-wx-rawbmp.patch | 12 - .../superslicer-2.4.58.3-boost-1.79-port-v2.patch | 244 --------------------- .../files/superslicer-2.4.58.3-cereal.patch | 70 ------ .../files/superslicer-2.4.58.3-openexr3.patch | 77 ------- .../superslicer-2.4.58.3-wxgtk3-wayland.patch | 21 -- .../superslicer/superslicer-2.4.58.3-r1.ebuild | 97 -------- .../superslicer/superslicer-2.5.59.0-r1.ebuild | 98 --------- .../superslicer/superslicer-2.5.59.0-r2.ebuild | 99 --------- .../superslicer/superslicer-2.5.59.0-r3.ebuild | 101 +++++++++ 11 files changed, 102 insertions(+), 741 deletions(-) delete mode 100644 media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch delete mode 100644 media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch delete mode 100644 media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch delete mode 100644 media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch delete mode 100644 media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch delete mode 100644 media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch delete mode 100644 media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild delete mode 100644 media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild delete mode 100644 media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild create mode 100644 media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild (limited to 'media-gfx/superslicer') diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index ac6179e52141..0927a14174ea 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,9 +1,3 @@ -AUX superslicer-2.4.58.3-AppConfig-include-I18N.patch 396 BLAKE2B 429dc3d1699b53d2e9c33e6240e3bfa2d6bd65ebd693d855b372f1fe0616f80ffe360feea886ea4bfd23e625fa851b38757d569a397e4e781bdd17760431c3e1 SHA512 f1910e32317122112130ce05793e0df038c99c06639098f7949af7d7f4f1097a1101bdc764e68d5ad3c3f5892fdd7865c1c19b23366e29da4ead0fa04877ee8a -AUX superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch 406 BLAKE2B 2879144cd04dc2a3478aae9d5922ac99b7a3e503d37a7900e7eb52094303fdb98415b51d1c20e4c5887da2b22c761fa6988494954d9261a08811b5cdd3e6a594 SHA512 961a9fa654e2336746280ef6b1d879089ee43cea802efd5c11ee8fb1ce98ddf8091005bc5a0a10e047d497c0103f7c0f925f57a54c029e6a7dd1ee60a603ee4e -AUX superslicer-2.4.58.3-boost-1.79-port-v2.patch 9044 BLAKE2B cec6f33857de0b304ee32d859db17366ae14d11a43f2a877e81c95c7725bc928c4207bed615f3dc55916a713966f9942f78fab79a266c45eef5ed99bb4032dda SHA512 b060637758101fd2df07be493e37a0f1eeef4416ea51f43dee31d657aff8066fb3f60e767ee3d5f84d248f9a1fb72ce0065c2f081d6c4748f9da0eb4f9fcb350 -AUX superslicer-2.4.58.3-cereal.patch 2628 BLAKE2B 26001908801db3c7acfa12eb0e37094818b57577c99f90579e15b93b0e2aa796345e6facc807c929ccd63d566ebbf0497dbaa8bc518a397a0ac68e03d53763c3 SHA512 0f8ed92d5662bddc0ce09cbdd8c67736957febe317753c5111b9cc7dcfe99335fa4eb722e03940951b89c82d2d237898716cd66d2d2e54cd250b5c872047a48f -AUX superslicer-2.4.58.3-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb -AUX superslicer-2.4.58.3-wxgtk3-wayland.patch 485 BLAKE2B a6a12b7b6b0da28593ee417e45bc97d9c297ce40b8f4a3adb3defa237ca4849238d82f58b4e8e7a4432d3167613845dd828db37529db6dbc9626bb89aa29437c SHA512 515c9b4b00cdfdc268febba8614fe9d2f33c5721ab17935a19055a25ef870ec04a51fc9af801f159dd48fb1a2d882695df373ee3b28dc676ac50f0fbaf73d474 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 @@ -12,11 +6,7 @@ AUX superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch 690 BLAKE2B 410f712603346 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 -DIST superslicer-2.4.58.3-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76 -DIST superslicer-2.4.58.3.tar.gz 45203382 BLAKE2B 822af2a1cb8978b21f8efdc0eb4841ec1d86517fd07782a8dfa6be2a58514dc3e772221dca40ff62808cb798fc4f51484b24e847328a7a6f154708431f0c4d3b SHA512 00302fba9ada1cc5df3c58f42fdb7f98322f94de7b78876c6a54a2229ae289e785082ea7a69f67bee54321fc4d97811675eeb70932e5774ab78ca8859343dd4d 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 -EBUILD superslicer-2.4.58.3-r1.ebuild 2105 BLAKE2B 20cbba8ea3066567c4878e56788455d03799b7d00172ade89e476fdceba1ae88d025ed08b818b1ab1867d892ff353b49343a6d121a5d4af4930c09efbcb582d4 SHA512 9e983deee4597c285aec3cd7e359df9792363763524b8983faf2d03c832a72efa0caa5450570188aeb8be3504ef2b910fe3e2620fa02fa4e6907d1a2440ce327 -EBUILD superslicer-2.5.59.0-r1.ebuild 2130 BLAKE2B 701f37cd47ba8f95c96d8e1c78ba3f6874e8a1805f5043bd5d30f2dbe6efb61056dba653ce7e4add0ca03ab5d11b46d806e218f95e7e842a5d0689000813b8ba SHA512 91e7fc8bfdfc1dc1f20060a27ea4e6f99fc48e33cbede293cf1d594124cb6c93c8bc9c3c9da6affaa127420b128dae45ff375400a1d8e2e9c5b35af8ad49534e -EBUILD superslicer-2.5.59.0-r2.ebuild 2195 BLAKE2B aceb6d93d5db050312c52047e18f1a5ac3da0aacbdd0f07830b04c4d5a21aaefabcd6d7a5f68f1f2a095a34b354adcd841bc9f3adbb164d107dd8ea650a3a98c SHA512 2b9235337c54b62b7e8df6f3d043666b1da14d5f257231947fe283585539d5701437a981f3dc37583a72117cccdb4a220d1bb7524aad49819227340f03e6de5b +EBUILD superslicer-2.5.59.0-r3.ebuild 2244 BLAKE2B 0900a5070cbb47c86a352fcf925ca5ce5083643cec94f2e76ea0e1562d5729c2f7ef1b489f181e5f7a969bd0e402cf6952d97ad2849405c731ba3e3b6c2f5d39 SHA512 85d16abf564bff432a3c65342d5a2d0d7173d6118f4acdb6e66d0cedaff328dcaaa24aac0fc2d443c5607a6b045f380bad6583e2dc5a73536eef7e5115465dd0 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331 diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch deleted file mode 100644 index c5e7398e5bdd..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp -index 59910e6..c35986c 100644 ---- a/src/libslic3r/AppConfig.cpp -+++ b/src/libslic3r/AppConfig.cpp -@@ -1,6 +1,7 @@ - #include - #include "libslic3r/libslic3r.h" - #include "libslic3r/Utils.hpp" -+#include "libslic3r/I18N.hpp" - #include "AppConfig.hpp" - #include "Exception.hpp" - #include "LocalesUtils.hpp" diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch deleted file mode 100644 index c2e3a3ef8f39..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -index be157ea..d63eb11 100644 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include "wxExtensions.hpp" - - #include diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch deleted file mode 100644 index 0c1f31a95b72..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp -index 7c8029c..4791f06 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>& 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 39b590e..b2a8dce 100644 ---- a/src/libslic3r/AppConfig.cpp -+++ b/src/libslic3r/AppConfig.cpp -@@ -1,3 +1,4 @@ -+#include - #include "libslic3r/libslic3r.h" - #include "libslic3r/Utils.hpp" - #include "AppConfig.hpp" -diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp -index d811ddc..1a70230 100644 ---- a/src/libslic3r/AppConfig.hpp -+++ b/src/libslic3r/AppConfig.hpp -@@ -5,6 +5,7 @@ - #include - #include - -+#include - #include - - #include "libslic3r/Config.hpp" -diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp -index 5bf5205..7b87052 100644 ---- a/src/libslic3r/LocalesUtils.cpp -+++ b/src/libslic3r/LocalesUtils.cpp -@@ -1,3 +1,4 @@ -+#include - #include "LocalesUtils.hpp" - - #ifdef _WIN32 -diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp -index aa33fb6..277a4b4 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/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -index 89212f2..be157ea 100644 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp -@@ -18,6 +18,11 @@ - #include - #include "Notebook.hpp" - -+#include -+#include -+#include -+#include -+ - #include "MainFrame.hpp" - #include "wxExtensions.hpp" - -diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -index fcb7472..866ebae 100644 ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -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 ea7142c..1d75ba7 100644 ---- a/src/slic3r/GUI/FreeCADDialog.cpp -+++ b/src/slic3r/GUI/FreeCADDialog.cpp -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - // 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 -@@ -321,7 +322,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. -@@ -368,7 +369,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 7851030..4cdd242 100644 ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp -index 3291630..3a984bf 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 -+ - #include - #include - #include - #include - #include --#include -+ - #include - #include - #include -@@ -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& 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& 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 523e52c..bd07f02 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 - #include - #include - -diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp -index 5a4a1e2..672bdfa 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 -+#include -+#include -+#include -+#include -+#include -+#include - - #include - -diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp -index 13a4ac0..eb63f2a 100644 ---- a/src/slic3r/GUI/Tab.cpp -+++ b/src/slic3r/GUI/Tab.cpp -@@ -36,6 +36,8 @@ - #include - #include - #include -+#include -+#include - - #include "wxExtensions.hpp" - #include "PresetComboBoxes.hpp" -@@ -1692,7 +1694,7 @@ std::vector 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 5fbe94e..b760559 100644 ---- a/src/slic3r/Utils/Http.cpp -+++ b/src/slic3r/Utils/Http.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - - #include - -@@ -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.4.58.3-cereal.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch deleted file mode 100644 index 7b3e179a05f5..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/cmake/modules/Findcereal.cmake b/cmake/modules/Findcereal.cmake -deleted file mode 100644 -index b482975..0000000 ---- a/cmake/modules/Findcereal.cmake -+++ /dev/null -@@ -1,26 +0,0 @@ --set(_q "") --if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) -- set(_q QUIET) -- set(_quietly TRUE) --endif() --find_package(${CMAKE_FIND_PACKAGE_NAME} ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG ${_q}) -- --if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FOUND) -- # Fall-back solution to find the Cereal serialization library header file -- include(CheckIncludeFileCXX) -- add_library(cereal INTERFACE) -- target_include_directories(cereal INTERFACE include) -- -- if (_quietly) -- set(CMAKE_REQUIRED_QUIET ON) -- endif() -- CHECK_INCLUDE_FILE_CXX("cereal/cereal.hpp" HAVE_CEREAL_H) -- -- if (NOT HAVE_CEREAL_H) -- if (${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) -- message(FATAL_ERROR "Cereal library not found. Please install the dependency.") -- elseif(NOT _quietly) -- message(WARNING "Cereal library not found.") -- endif() -- endif () --endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ec44417..aab1348 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) - 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 21aab3b..8c6b705 100644 ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -358,7 +358,6 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS}) - target_link_libraries(libslic3r - libnest2d - admesh -- cereal - libigl - miniz - boost_libs -diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index 3f231ef..ffd9a3f 100644 ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -293,7 +293,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$: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 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.4.58.3-openexr3.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch deleted file mode 100644 index 7bd04e6fad10..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake -index 4fde5fa..566e73a 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.4.58.3-wxgtk3-wayland.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch deleted file mode 100644 index 5f6eb58740ae..000000000000 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp -index 330869f..70c472c 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.4.58.3-r1.ebuild b/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild deleted file mode 100644 index c8ab9ba7f60f..000000000000 --- a/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild +++ /dev/null @@ -1,97 +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" - -inherit cmake wxwidgets xdg - -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/748fbdfd2ac077e4e415868e7bc963740b92aa8e.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}-boost-1.79-port-v2.patch" - "${FILESDIR}/${P}-CreateMMUTiledCanvas-include-wx-rawbmp.patch" - "${FILESDIR}/${P}-AppConfig-include-I18N.patch" - "${FILESDIR}/${P}-cereal.patch" - "${FILESDIR}/${P}-openexr3.patch" - "${FILESDIR}/${P}-wxgtk3-wayland.patch" -) - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_unpack() { - default - - mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die -} - -src_configure() { - CMAKE_BUILD_TYPE="Release" - - 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 -} diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild deleted file mode 100644 index ca0ff2b51c74..000000000000 --- a/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild +++ /dev/null @@ -1,98 +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" - -inherit cmake wxwidgets xdg - -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/748fbdfd2ac077e4e415868e7bc963740b92aa8e.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}-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" - - 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 -} diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild deleted file mode 100644 index 08c74ac46f52..000000000000 --- a/media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild +++ /dev/null @@ -1,99 +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" - -inherit cmake wxwidgets xdg - -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/748fbdfd2ac077e4e415868e7bc963740b92aa8e.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" - - 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 -} diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild new file mode 100644 index 000000000000..5316cceb3c63 --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild @@ -0,0 +1,101 @@ +# 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" + +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/748fbdfd2ac077e4e415868e7bc963740b92aa8e.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 +} -- cgit v1.2.3