[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
commit: 1d274045638c2ef671a60b5c324ea264c3f85e5b Author: Sam James gentoo org> AuthorDate: Tue Jul 16 07:18:51 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jul 16 07:18:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d274045 media-gfx/superslicer: add 2.5.59.8 Closes: https://bugs.gentoo.org/918510 Thanks-to: Egor gmail.com> Signed-off-by: Sam James gentoo.org> media-gfx/superslicer/Manifest | 2 + ...rslicer-2.5.59.8-additional-imports-fixes.patch | 111 + ...r-2.5.59.8-boost-replace-load-string-file.patch | 43 ...icer-2.5.59.8-fix-compilation-error-gnu17.patch | 20 .../superslicer-2.5.59.8-libnest2d-link-xcb.patch | 12 +++ media-gfx/superslicer/superslicer-2.5.59.8.ebuild | 109 6 files changed, 297 insertions(+) diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index c076101e258a..ea74f49bd757 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,2 +1,4 @@ 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 +DIST superslicer-2.5.59.8-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1 +DIST superslicer-2.5.59.8.tar.gz 46021260 BLAKE2B 04abffd1a9cdf417d544539d5cde9b3559f2da7c1cb24cfa0e4a5d11359bca53cb25a90a3a14b26ee10e33e283ba4774d404265e6740b5457f82110be2a44af9 SHA512 57ef6c129c24378d6f4f78d34a60ed15668a8c5c266fa706937edebbd7b52d145657aae1e46a7b1d19dabaf403465bc5af50a94fa70205456bfc87a1458bac6e diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch new file mode 100644 index ..1ccef804d0b4 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch @@ -0,0 +1,111 @@ +diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp +index e4e16d263..629fd6e0b 100644 +--- a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp +@@ -3,6 +3,7 @@ + + #include "libslic3r.h" + #include "Point.hpp" ++#include + + namespace Slic3r { + +diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp +index 10cae794d..c82969e20 100644 +--- a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp +@@ -20,6 +20,7 @@ + #include + #endif + #include ++#include + #include + #include + #include "OG_CustomCtrl.hpp" +diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp +index ab6039ff0..be01e890a 100644 +--- a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include "Notebook.hpp" + #include "ButtonsDescription.hpp" + #include "OG_CustomCtrl.hpp" +diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp +index a6c7b580e..1e1566f37 100644 +--- a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp +@@ -29,6 +29,7 @@ + #include + #include + ++#include + #include + #include + #include +diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp +index 782c58741..08dfba661 100644 +--- a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp +@@ -2,6 +2,7 @@ + #define slic3r_ObjectID_hpp_ + + #include ++#include + + namespace Slic3r { + +diff --git a/src/libslic3r/Format/BBConfig.hpp b/src/libslic3r/Format/BBConfig.hpp +index a4b27675c..8d821bed5 100644 +--- a/src/libslic3r/Format/BBConfig.hpp b/src/libslic3r/Format/BBConfig.hpp +@@ -2,6 +2,13 @@ + #define slic3r_Format_BBconfig_hpp_ + + #include "miniz_extension.hpp" ++#include ++#include ++#include "libslic3r/Config.hpp" ++#include ++#include ++#include ++#include + + #ifdef __APPLE__ + #include +diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp +index 8a39d92c5..68e8c9254 100644 +--- a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp +@@ -13,9 +13,8 @@ + #include "../PrintConfig.hpp" + #include "../Utils.hpp" + #include "Print.hpp" +- +-#include + */ ++#include + + + namespace Slic3r { +diff --git a/src/libslic3r/Format/bbs_3mf.cpp
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
commit: a4f373863adad74ac3cba7cdf02ac1634fcee0ab Author: Pacho Ramos gentoo org> AuthorDate: Fri Jul 5 17:26:36 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Jul 5 17:48:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f37386 media-gfx/superslicer: drop 2.5.59.0-r3 Signed-off-by: Pacho Ramos gentoo.org> media-gfx/superslicer/Manifest | 2 - 0-boost-1.81-std-wxString-to-std-wstring.patch | 40 .../files/superslicer-2.5.59.0-boost.patch | 256 - .../files/superslicer-2.5.59.0-cereal.patch| 53 - ...2.5.59.0-dont-install-bundled-angelscript.patch | 53 - ...erslicer-2.5.59.0-fix-gcodeviewer-symlink.patch | 11 - .../superslicer-2.5.59.0-missing-includes.patch| 36 --- .../files/superslicer-2.5.59.0-openexr3.patch | 77 --- .../superslicer-2.5.59.0-wxgtk3-wayland.patch | 21 -- .../superslicer/superslicer-2.5.59.0-r3.ebuild | 102 10 files changed, 651 deletions(-) diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 006a776d5fba..c076101e258a 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,4 +1,2 @@ -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 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.. --- 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 ) -> bool { --if (! path.Lower().EndsWith(m_valid_suffix.Lower())) { -+auto validate_path = [this](const std::wstring ) -> 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 -
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
commit: c5b3c63342db2a72ff0d667d20d6dc49be572902 Author: Piotr Karbowski gentoo org> AuthorDate: Sun Jun 4 13:01:33 2023 + Commit: Piotr Karbowski gentoo org> CommitDate: Sun Jun 4 13:02:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b3c633 media-gfx/superslicer: 2.5.59.2-r2 revbump with updated includes patch. Signed-off-by: Piotr Karbowski gentoo.org> ...superslicer-2.5.59.2-missing-includes-fix.patch | 36 ++ 2-r1.ebuild => superslicer-2.5.59.2-r2.ebuild} | 0 2 files changed, 36 insertions(+) diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch index 289198863367..432f4f16870e 100644 --- a/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch +++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch @@ -10,6 +10,18 @@ index a626986..5f2d963 100644 #include "AppConfig.hpp" #include "Exception.hpp" #include "LocalesUtils.hpp" +diff --git a/src/libslic3r/CustomGCode.hpp b/src/libslic3r/CustomGCode.hpp +index 633edc8..fcd26ff 100644 +--- a/src/libslic3r/CustomGCode.hpp b/src/libslic3r/CustomGCode.hpp +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + namespace Slic3r { + diff --git a/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp index 1c54588..c74df3a 100644 --- a/src/libslic3r/ExtrusionEntity.hpp @@ -35,6 +47,18 @@ index 34ef2ae..20fe8b7 100644 namespace Slic3r { namespace Geometry { +diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp +index 01e1f47..1dce27a 100644 +--- a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp +@@ -2,6 +2,7 @@ + #define PNGREAD_HPP + + #include ++#include + #include + #include + diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp index 34ec4e6..ed83b3e 100644 --- a/src/libslic3r/PerimeterGenerator.hpp @@ -60,6 +84,18 @@ index f69d68f..1dd55f2 100644 #include #include +diff --git a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp +index 34821c4..a74a850 100644 +--- a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + #include + #ifndef WX_PRECOMP diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp index 553a183..686630c 100644 --- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp diff --git a/media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild similarity index 100% rename from media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild rename to media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
commit: 3fbbb57dc6fa7246c5ce60c71c7fb9289bc3e15f Author: Piotr Karbowski gentoo org> AuthorDate: Wed Dec 28 18:12:45 2022 + Commit: Piotr Karbowski gentoo org> CommitDate: Wed Dec 28 18:13:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbbb57d media-gfx/superslicer: drop old. Signed-off-by: Piotr Karbowski gentoo.org> media-gfx/superslicer/Manifest | 2 - ...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 - 9 files changed, 633 deletions(-) diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index ef2d980d92d4..80d31364ef86 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,4 +1,2 @@ -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 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.. --- 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.. --- 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.. --- 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
commit: 0311dfd01ada250ca1b8b3a710122fc8d62ccc98 Author: Piotr Karbowski gentoo org> AuthorDate: Tue Dec 27 19:58:44 2022 + Commit: Piotr Karbowski gentoo org> CommitDate: Tue Dec 27 20:12:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0311dfd0 media-gfx/superslicer: fix building with boost-1.81. Patch contributed by Bradley Jarvis. Bug: https://bugs.gentoo.org/887055 Signed-off-by: Piotr Karbowski gentoo.org> 0-boost-1.81-std-wxString-to-std-wstring.patch | 40 + .../superslicer/superslicer-2.5.59.0-r2.ebuild | 99 ++ 2 files changed, 139 insertions(+) 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 new file mode 100644 index ..1cb0d9f1afff --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch @@ -0,0 +1,40 @@ +--- 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 ) -> bool { +-if (! path.Lower().EndsWith(m_valid_suffix.Lower())) { ++auto validate_path = [this](const std::wstring ) -> 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/superslicer-2.5.59.0-r2.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild new file mode 100644 index ..08c74ac46f52 --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild @@ -0,0 +1,99 @@ +# 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:= +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
commit: 81e3ca3b7c131e8345aede89e3bbcd700e1ad567 Author: Piotr Karbowski gentoo org> AuthorDate: Thu Jul 14 20:44:58 2022 + Commit: Piotr Karbowski gentoo org> CommitDate: Thu Jul 14 20:45:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e3ca3b media-gfx/superslicer: new package. Signed-off-by: Piotr Karbowski gentoo.org> media-gfx/superslicer/Manifest | 1 + ...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 ++ media-gfx/superslicer/metadata.xml | 12 + media-gfx/superslicer/superslicer-2.4.58.3.ebuild | 88 9 files changed, 537 insertions(+) diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest new file mode 100644 index ..fabb29b27e6a --- /dev/null +++ b/media-gfx/superslicer/Manifest @@ -0,0 +1 @@ +DIST superslicer-2.4.58.3.tar.gz 45203382 BLAKE2B 822af2a1cb8978b21f8efdc0eb4841ec1d86517fd07782a8dfa6be2a58514dc3e772221dca40ff62808cb798fc4f51484b24e847328a7a6f154708431f0c4d3b SHA512 00302fba9ada1cc5df3c58f42fdb7f98322f94de7b78876c6a54a2229ae289e785082ea7a69f67bee54321fc4d97811675eeb70932e5774ab78ca8859343dd4d 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 new file mode 100644 index ..c5e7398e5bdd --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index ..c2e3a3ef8f39 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index ..0c1f31a95b72 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch @@ -0,0 +1,244 @@ +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 ) + VendorProfile VendorProfile::from_ini(const boost::filesystem::path , bool load_all) + { + ptree tree; +-