tkurbad/tkurbad-overlay
tkurbad/tkurbad-overlay
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated superslicer

Browse Source
This commit is contained in:
Torsten Kurbad 2025-01-05 00:14:15 +01:00
parent 6af924cd50
commit 8a01a89ef4
18 changed files with 429 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
media-gfx/superslicer/Manifest
View File

@ -1,18 +1,19 @@
AUX superslicer-2.5.59.12-additional-imports-fixes.patch 3266 BLAKE2B 9016a6baa5c97681b0caadbffb6b2a890f9f69083ccf6201e9945ca1b3ff3aebb04b4eab1b94bc2f69b6e21d212281e0a2d0aeaa26b3fc3ecc0afbaa2db845f1 SHA512 8ae0692cd708cb14e268f10740629c9a69fad5ddce1d2c11bc73cccceb4ec91a5a9dc508deb78743828ea366ef8924e149306ce3674c55074b86800cc25c575a
AUX superslicer-2.5.59.12-boost-replace-load-string-file.patch 1753 BLAKE2B 009f44faffbe83ea15d029e4f36bfe0182c13df1bd80c4732f3f9460046c5ac38a77bf8a6294c70931aaab55f95ca554838a8f17b8983ccd7bc9e1e6553bff67 SHA512 5b61c2de780b645237e5fa9018667d94e90cde3f1d5a6c6c29db96bede7cfd023f8ca272f0172b859914b6bec0fe5b4e6013512fff1a54b7975f1b2a93a42ef6
AUX superslicer-2.5.59.12-boost.patch 14511 BLAKE2B e4a8edaa2cb7311468ea79f3790a395fe84646c73d5665dc0a4c230425096efe4defde2a1f1db00e54bf74606fc83a1d9f9c7bf13c3f8279821931cfa3ce1504 SHA512 13e2ede50f9c42311c13c04e282ac16310653a6058a1727fb3cea35c2634d56af02f1858f712850b5ea37993fb535311253872b48383b000c35c512589cf1889
AUX superslicer-2.5.59.12-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38
AUX superslicer-2.5.59.12-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868
AUX superslicer-2.5.59.12-fix-compilation-error-gnu17.patch 812 BLAKE2B b9348bfc8ba5b9c63e269b453d39f3b56de7b1c62f5dd8ad376a6fb0abe7c520cb13c3befdd18521f4abfe4cb1eccae574f9d80ae355236733b8f0e683db5a95 SHA512 bbb36ed9572f2422c69be356b8f62531f4dabe0d9a731dff0697a0358d6bc4846dbe854c4e044ca06ba0ee6f87c2f80cb137ecf27f59d11cff829791376c9508
AUX superslicer-2.5.59.12-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch 5193 BLAKE2B fcd3b72d51a67dc1670526f7b40e10a1b364f59201724db2739ad85aa99ae5184c6491c7d825b75df608d30d407be4a0c39e5b023ae9a320c918bb0f1aec5ea5 SHA512 385b017212241c4daa678fa4f83ec11833f2aa17294a68d2a6ce60deafe03710dfa55f262072fe8ef96d06247a9c2dd55433091699b173c5b8c49c8f8ad1bf98
AUX superslicer-2.5.59.12-libnest2d-link-xcb.patch 678 BLAKE2B 7e6328a9058206d325c77a73d7621dffe3a92c187e9d27d8173e2f0f77211fba3a87421f3827124cfe819649afbba4e5767df6636bd0b70c84f12e785e5879a9 SHA512 d6152f9465e752e0f88bd69c4cfe0b39cbd6df05f27df7b98b174bf8100b93f69feb7ba00086f67b4962a3a544bd91dcafa24679286318f9abe5609454c2eb43
AUX superslicer-2.5.59.12-link-occtwrapper-statically.patch 2916 BLAKE2B 9f28ba510235b20ad5cc8cd919bce00137b62ac1b64141ccaf0559f2e5d263b9c71539cc302a7e2ed046b3965aa5de36dff6131491a666fd90275bbbee95f450 SHA512 b49f2db32814c1bc467751f6d1b73bf22bba75e37b84b42bb0b8f42b5aa712a30cc9bb70f2210abed124509ca3d037e2450700a82d0994e8c3e4bafe498c6dc9
AUX superslicer-2.5.59.12-missing-includes-fix.patch 3819 BLAKE2B 6c2fc6fad3e91ff68d4c307f19ea7641934063a75384881fb65948869a8209dfdce79086a7fb8f5348f15f40190f90424141c0ee5e6d23f636ea05a18a06bdfa SHA512 3554e5196444463a711dcc705b03a410f84e2f1f0571d7ed014ee1b7e58801979752bae5713fb93c53fd547bfdce78cad9f206bbd93e8d0dca3a74977b137c33
AUX superslicer-2.5.59.12-opencascade-7.8.0.patch 548 BLAKE2B 726689ba17a8f4511863bc9a5adcc1254977f14eb0f546a93c5fc562991d85b284de83e63f35d90b7983606a7b90528ee2d4c2d1cd54691714767424e1c7b0e5 SHA512 2e19333d288e9c715114288686e8fc5ace4f526b28cb7dd3fe4dd5a7bc4d361367cae4ca26cca811b612c1245d8673d2224070ff5e40c1f20266a3be345b3b49
AUX superslicer-2.5.59.12-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb
AUX superslicer-2.5.59.12-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5
AUX superslicer-2.5.59.12-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339
DIST superslicer-2.5.59.12-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1
DIST superslicer-2.5.59.12.tar.gz 46041538 BLAKE2B c0a94de865f22d5f953c724bb751088ba3d31e17a7d3721b04591b895d265e489251705dee5dd72691e1fdb59b2575c6f9d88cc979a17369785ef4bffeb62056 SHA512 2a482628f59f597853ca14d2c603e2919b412296165aa501f052da8fa2be5f69a54570fd9c582961c7009f423c2128ba91a28628cf0056eefe11661345b1805a
EBUILD superslicer-2.5.59.12.ebuild 2638 BLAKE2B e8a8bd33520ea1b523a0691e888274c39f874e33797d0381317ad2eef7127b0e30562d4a0a1ece686e44696fb3d196bc62b404d0055d6711c9e91cef9c3c3a89 SHA512 961df2bb9a539e8cb93a57025643d372c41f5f765fac7127dab403f32dbb8dacd75589c9fc269debed39bb2c5fcddcf1c0d13d82a4c52cf1ac1a41a4fa28119c
AUX superslicer-2.5.60.0-additional-imports-fixes.patch 3266 BLAKE2B 9016a6baa5c97681b0caadbffb6b2a890f9f69083ccf6201e9945ca1b3ff3aebb04b4eab1b94bc2f69b6e21d212281e0a2d0aeaa26b3fc3ecc0afbaa2db845f1 SHA512 8ae0692cd708cb14e268f10740629c9a69fad5ddce1d2c11bc73cccceb4ec91a5a9dc508deb78743828ea366ef8924e149306ce3674c55074b86800cc25c575a
AUX superslicer-2.5.60.0-boost-replace-load-string-file.patch 1753 BLAKE2B 009f44faffbe83ea15d029e4f36bfe0182c13df1bd80c4732f3f9460046c5ac38a77bf8a6294c70931aaab55f95ca554838a8f17b8983ccd7bc9e1e6553bff67 SHA512 5b61c2de780b645237e5fa9018667d94e90cde3f1d5a6c6c29db96bede7cfd023f8ca272f0172b859914b6bec0fe5b4e6013512fff1a54b7975f1b2a93a42ef6
AUX superslicer-2.5.60.0-boost.patch 18863 BLAKE2B b5e16631250da1492593992622d688cf9e7b7ab134e113687af22b054ff1a02657ac354488ad8993bdb9fac4b0c54834c876f7809697773acdf02c2292d9050b SHA512 9ca31946f745b5b1d1bcf5b462ba13b185dad0f2adb02b2168c2c1dfe1c67f0b7249ca3c3fd4ef2df1356016f8bdeda0ead019075fae2f22286c6e218fb0415f
AUX superslicer-2.5.60.0-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38
AUX superslicer-2.5.60.0-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868
AUX superslicer-2.5.60.0-fix-compilation-error-gnu17.patch 812 BLAKE2B b9348bfc8ba5b9c63e269b453d39f3b56de7b1c62f5dd8ad376a6fb0abe7c520cb13c3befdd18521f4abfe4cb1eccae574f9d80ae355236733b8f0e683db5a95 SHA512 bbb36ed9572f2422c69be356b8f62531f4dabe0d9a731dff0697a0358d6bc4846dbe854c4e044ca06ba0ee6f87c2f80cb137ecf27f59d11cff829791376c9508
AUX superslicer-2.5.60.0-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch 5193 BLAKE2B fcd3b72d51a67dc1670526f7b40e10a1b364f59201724db2739ad85aa99ae5184c6491c7d825b75df608d30d407be4a0c39e5b023ae9a320c918bb0f1aec5ea5 SHA512 385b017212241c4daa678fa4f83ec11833f2aa17294a68d2a6ce60deafe03710dfa55f262072fe8ef96d06247a9c2dd55433091699b173c5b8c49c8f8ad1bf98
AUX superslicer-2.5.60.0-libnest2d-link-xcb.patch 678 BLAKE2B 7e6328a9058206d325c77a73d7621dffe3a92c187e9d27d8173e2f0f77211fba3a87421f3827124cfe819649afbba4e5767df6636bd0b70c84f12e785e5879a9 SHA512 d6152f9465e752e0f88bd69c4cfe0b39cbd6df05f27df7b98b174bf8100b93f69feb7ba00086f67b4962a3a544bd91dcafa24679286318f9abe5609454c2eb43
AUX superslicer-2.5.60.0-link-occtwrapper-statically.patch 2916 BLAKE2B 9f28ba510235b20ad5cc8cd919bce00137b62ac1b64141ccaf0559f2e5d263b9c71539cc302a7e2ed046b3965aa5de36dff6131491a666fd90275bbbee95f450 SHA512 b49f2db32814c1bc467751f6d1b73bf22bba75e37b84b42bb0b8f42b5aa712a30cc9bb70f2210abed124509ca3d037e2450700a82d0994e8c3e4bafe498c6dc9
AUX superslicer-2.5.60.0-missing-includes-fix.patch 3819 BLAKE2B 6c2fc6fad3e91ff68d4c307f19ea7641934063a75384881fb65948869a8209dfdce79086a7fb8f5348f15f40190f90424141c0ee5e6d23f636ea05a18a06bdfa SHA512 3554e5196444463a711dcc705b03a410f84e2f1f0571d7ed014ee1b7e58801979752bae5713fb93c53fd547bfdce78cad9f206bbd93e8d0dca3a74977b137c33
AUX superslicer-2.5.60.0-opencascade-7.8.0.patch 548 BLAKE2B 726689ba17a8f4511863bc9a5adcc1254977f14eb0f546a93c5fc562991d85b284de83e63f35d90b7983606a7b90528ee2d4c2d1cd54691714767424e1c7b0e5 SHA512 2e19333d288e9c715114288686e8fc5ace4f526b28cb7dd3fe4dd5a7bc4d361367cae4ca26cca811b612c1245d8673d2224070ff5e40c1f20266a3be345b3b49
AUX superslicer-2.5.60.0-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb
AUX superslicer-2.5.60.0-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5
AUX superslicer-2.5.60.0-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339
AUX superslicer-2.5.60.0-wxwidgets-3.2.patch 780 BLAKE2B 7b9b7423f80e743d6eca57dc0220c22372036ea428f122c0660db4c8e2b7a2f264bbd0c16ddfdbc2390adccc1a9aa0824abc49e8e0a65097dfd3563a8c4209d6 SHA512 a19699ecd9f6528700c105f3382a99bced761458532ca50047861b134efc8040747782e81a8892525f51723ddb600f936e979c78618908fb8b4653bf98a24c8e
DIST superslicer-2.5.60.0-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1
DIST superslicer-2.5.60.0.tar.gz 46123603 BLAKE2B 2008c08eb0361b1659a57ff4b4d27f459c08280bc4f10ec518cd20104c8fb481395d816000cbc1562cea4e730e68830ce3890e4f949403c65a8bd95d2a0825bb SHA512 a53f4cc9b5a20f3f60d38553d47bfd19ce8bd739a8a16493bbcf64f75825fa760b8c107d7f927d49d967f7d067fac8c428c8f6e67219e74b0970d9ab7aa5b9e6
EBUILD superslicer-2.5.60.0.ebuild 2678 BLAKE2B e2bce3d341b1ae4a9b0cf06e279ad2edfa41b1e9e65e6c98ca536874cbf6c3c836e8557fdd98fcce8bcf596c405b381c3ea67773868ac08f47bf619fbdf95d8f SHA512 3d067d044d5a5bb14345dcc7546b50ad243bb97f9335427591cd1fd2b88ac44339a53ec8c84e59746857b597f6650e127c0c8df1963acd4d8f19fe4c3e1df1ad
MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331

302
media-gfx/superslicer/files/superslicer-2.5.59.12-boost.patch
View File

@ -1,302 +0,0 @@
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/hints/HintsToPot.cpp SuperSlicer-2.5.59.12/src/hints/HintsToPot.cpp
--- SuperSlicer-2.5.59.12.orig/src/hints/HintsToPot.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/hints/HintsToPot.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.cpp SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -1,5 +1,6 @@
#include "AppConfig.hpp"
+#include <boost/filesystem.hpp>
#include "libslic3r.h"
#include "format.hpp"
#include "Exception.hpp"
@@ -15,6 +16,7 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/directory.hpp>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
#include <boost/format/format_fwd.hpp>
#include <boost/locale.hpp>
#include <boost/log/trivial.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.hpp SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.hpp 2024-06-20 19:29:16.076450396 +0200
@@ -5,6 +5,7 @@
#include <map>
#include <string>
+#include <boost/filesystem/path.hpp>
#include <boost/algorithm/string/trim_all.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/LocalesUtils.cpp SuperSlicer-2.5.59.12/src/libslic3r/LocalesUtils.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/LocalesUtils.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/LocalesUtils.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -1,3 +1,4 @@
+#include <boost/lexical_cast.hpp>
#include "LocalesUtils.hpp"
#ifdef _WIN32
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/Preset.cpp SuperSlicer-2.5.59.12/src/libslic3r/Preset.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/Preset.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/Preset.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -84,7 +84,7 @@
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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/Utils.hpp SuperSlicer-2.5.59.12/src/libslic3r/Utils.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/Utils.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/Utils.hpp 2024-06-20 19:29:16.076450396 +0200
@@ -7,6 +7,7 @@
#include <type_traits>
#include <system_error>
+#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/DesktopIntegrationDialog.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/DesktopIntegrationDialog.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/DesktopIntegrationDialog.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/DesktopIntegrationDialog.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -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 @@
} // namespace GUI
} // namespace Slic3r
-#endif // __linux__
\ Kein Zeilenumbruch am Dateiende.
+#endif // __linux__
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/FreeCADDialog.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/FreeCADDialog.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/FreeCADDialog.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/FreeCADDialog.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -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 @@
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 @@
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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/GUI_App.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/GUI_App.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/GUI_App.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/GUI_App.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/HintNotification.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/HintNotification.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/HintNotification.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/HintNotification.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -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 @@
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 @@
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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Preferences.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/Preferences.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Preferences.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/Preferences.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -12,6 +12,7 @@
#include "wxExtensions.hpp"
#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/PrintHostDialogs.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/PrintHostDialogs.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/PrintHostDialogs.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/PrintHostDialogs.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -81,8 +81,8 @@
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;
@@ -92,7 +92,7 @@
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);
}
@@ -102,7 +102,7 @@
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);
}
@@ -113,7 +113,7 @@
// 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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/RemovableDriveManager.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/RemovableDriveManager.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/RemovableDriveManager.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/RemovableDriveManager.cpp 2024-06-20 19:31:37.636759560 +0200
@@ -22,7 +22,7 @@
#include <pwd.h>
#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
-#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem.hpp>
#include <boost/process.hpp>
#endif
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/ScriptExecutor.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/ScriptExecutor.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/ScriptExecutor.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/ScriptExecutor.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -2,6 +2,12 @@
#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 "GUI_App.hpp"
#include "Plater.hpp"
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Tab.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/Tab.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Tab.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/Tab.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -38,6 +38,7 @@
#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 <wx/app.h>
@@ -1775,7 +1776,7 @@
//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 '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/Utils/Http.cpp SuperSlicer-2.5.59.12/src/slic3r/Utils/Http.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/Utils/Http.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/Utils/Http.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -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 @@
% 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);

0
media-gfx/superslicer/files/superslicer-2.5.59.12-additional-imports-fixes.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-additional-imports-fixes.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-boost-replace-load-string-file.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-boost-replace-load-string-file.patch
View File

398
media-gfx/superslicer/files/superslicer-2.5.60.0-boost.patch Normal file
View File

@ -0,0 +1,398 @@
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/hints/HintsToPot.cpp SuperSlicer-2.5.60.0/src/hints/HintsToPot.cpp
--- SuperSlicer-2.5.60.0.orig/src/hints/HintsToPot.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/hints/HintsToPot.cpp 2025-01-05 00:04:48.909483459 +0100
@@ -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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/libslic3r/AppConfig.cpp SuperSlicer-2.5.60.0/src/libslic3r/AppConfig.cpp
--- SuperSlicer-2.5.60.0.orig/src/libslic3r/AppConfig.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/libslic3r/AppConfig.cpp 2025-01-05 00:04:48.909483459 +0100
@@ -1,5 +1,6 @@
#include "AppConfig.hpp"
+#include <boost/filesystem.hpp>
#include "libslic3r.h"
#include "format.hpp"
#include "Exception.hpp"
@@ -15,6 +16,7 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/directory.hpp>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
#include <boost/format/format_fwd.hpp>
#include <boost/locale.hpp>
#include <boost/log/trivial.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/libslic3r/AppConfig.hpp SuperSlicer-2.5.60.0/src/libslic3r/AppConfig.hpp
--- SuperSlicer-2.5.60.0.orig/src/libslic3r/AppConfig.hpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/libslic3r/AppConfig.hpp 2025-01-05 00:04:48.909483459 +0100
@@ -5,6 +5,7 @@
#include <map>
#include <string>
+#include <boost/filesystem/path.hpp>
#include <boost/algorithm/string/trim_all.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/libslic3r/GCodeSender.hpp SuperSlicer-2.5.60.0/src/libslic3r/GCodeSender.hpp
--- SuperSlicer-2.5.60.0.orig/src/libslic3r/GCodeSender.hpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/libslic3r/GCodeSender.hpp 2025-01-05 00:04:48.909483459 +0100
@@ -35,7 +35,7 @@
void reset();
private:
- asio::io_service io;
+ asio::io_context io;
asio::serial_port serial;
boost::thread background_thread;
boost::asio::streambuf read_buffer, write_buffer;
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/libslic3r/LocalesUtils.cpp SuperSlicer-2.5.60.0/src/libslic3r/LocalesUtils.cpp
--- SuperSlicer-2.5.60.0.orig/src/libslic3r/LocalesUtils.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/libslic3r/LocalesUtils.cpp 2025-01-05 00:04:48.909483459 +0100
@@ -1,3 +1,4 @@
+#include <boost/lexical_cast.hpp>
#include "LocalesUtils.hpp"
#ifdef _WIN32
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/libslic3r/Preset.cpp SuperSlicer-2.5.60.0/src/libslic3r/Preset.cpp
--- SuperSlicer-2.5.60.0.orig/src/libslic3r/Preset.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/libslic3r/Preset.cpp 2025-01-05 00:04:48.910483530 +0100
@@ -84,7 +84,7 @@
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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/libslic3r/Utils.hpp SuperSlicer-2.5.60.0/src/libslic3r/Utils.hpp
--- SuperSlicer-2.5.60.0.orig/src/libslic3r/Utils.hpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/libslic3r/Utils.hpp 2025-01-05 00:04:48.910483530 +0100
@@ -7,6 +7,7 @@
#include <type_traits>
#include <system_error>
+#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2025-01-05 00:04:48.910483530 +0100
@@ -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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/DesktopIntegrationDialog.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/DesktopIntegrationDialog.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/DesktopIntegrationDialog.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/DesktopIntegrationDialog.cpp 2025-01-05 00:04:48.910483530 +0100
@@ -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 @@
} // namespace GUI
} // namespace Slic3r
-#endif // __linux__
\ Kein Zeilenumbruch am Dateiende.
+#endif // __linux__
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/FirmwareDialog.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/FirmwareDialog.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/FirmwareDialog.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/FirmwareDialog.cpp 2025-01-05 00:04:48.910483530 +0100
@@ -425,7 +425,7 @@
void FirmwareDialog::priv::avr109_reboot(const SerialPortInfo &port)
{
- asio::io_service io;
+ asio::io_context io;
Serial serial(io, port.port, 1200);
std::this_thread::sleep_for(std::chrono::milliseconds(50));
}
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/FreeCADDialog.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/FreeCADDialog.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/FreeCADDialog.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/FreeCADDialog.cpp 2025-01-05 00:04:48.910483530 +0100
@@ -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
@@ -63,7 +64,7 @@
class ExecVar {
public:
boost::process::opstream pyin;
- boost::asio::io_service ios;
+ boost::asio::io_context ios;
std::future<std::string> data_out;
std::future<std::string> data_err;
std::unique_ptr<boost::process::child> process;
@@ -322,7 +323,7 @@
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 @@
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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/GUI_App.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/GUI_App.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/GUI_App.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/GUI_App.cpp 2025-01-05 00:04:48.911483601 +0100
@@ -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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/HintNotification.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/HintNotification.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/HintNotification.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/HintNotification.cpp 2025-01-05 00:04:48.911483601 +0100
@@ -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 @@
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 @@
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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/Preferences.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/Preferences.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/Preferences.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/Preferences.cpp 2025-01-05 00:04:48.911483601 +0100
@@ -12,6 +12,7 @@
#include "wxExtensions.hpp"
#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/PrintHostDialogs.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/PrintHostDialogs.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/PrintHostDialogs.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/PrintHostDialogs.cpp 2025-01-05 00:04:48.911483601 +0100
@@ -81,8 +81,8 @@
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;
@@ -92,7 +92,7 @@
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);
}
@@ -102,7 +102,7 @@
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);
}
@@ -113,7 +113,7 @@
// 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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/RemovableDriveManager.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/RemovableDriveManager.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/RemovableDriveManager.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/RemovableDriveManager.cpp 2025-01-05 00:04:48.911483601 +0100
@@ -22,7 +22,7 @@
#include <pwd.h>
#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
-#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem.hpp>
#include <boost/process.hpp>
#endif
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/ScriptExecutor.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/ScriptExecutor.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/ScriptExecutor.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/ScriptExecutor.cpp 2025-01-05 00:04:48.911483601 +0100
@@ -2,6 +2,12 @@
#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 "GUI_App.hpp"
#include "Plater.hpp"
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/Tab.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/Tab.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/Tab.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/Tab.cpp 2025-01-05 00:04:48.912483671 +0100
@@ -39,6 +39,7 @@
#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 <wx/app.h>
@@ -1781,7 +1782,7 @@
//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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Bonjour.cpp SuperSlicer-2.5.60.0/src/slic3r/Utils/Bonjour.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Bonjour.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/Utils/Bonjour.cpp 2025-01-05 00:04:48.912483671 +0100
@@ -629,7 +629,7 @@
auto self = this;
try {
- boost::asio::io_service io_service;
+ boost::asio::io_context io_service;
udp::socket socket(io_service);
socket.open(udp::v4());
socket.set_option(udp::socket::reuse_address(true));
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Http.cpp SuperSlicer-2.5.60.0/src/slic3r/Utils/Http.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Http.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/Utils/Http.cpp 2025-01-05 00:04:48.912483671 +0100
@@ -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 @@
% 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 '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Serial.cpp SuperSlicer-2.5.60.0/src/slic3r/Utils/Serial.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Serial.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/Utils/Serial.cpp 2025-01-05 00:04:48.912483671 +0100
@@ -278,11 +278,11 @@
namespace asio = boost::asio;
using boost::system::error_code;
-Serial::Serial(asio::io_service& io_service) :
+Serial::Serial(asio::io_context& io_service) :
asio::serial_port(io_service)
{}
-Serial::Serial(asio::io_service& io_service, const std::string &name, unsigned baud_rate) :
+Serial::Serial(asio::io_context& io_service, const std::string &name, unsigned baud_rate) :
asio::serial_port(io_service, name)
{
set_baud_rate(baud_rate);
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Serial.hpp SuperSlicer-2.5.60.0/src/slic3r/Utils/Serial.hpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/Serial.hpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/Utils/Serial.hpp 2025-01-05 00:04:48.912483671 +0100
@@ -39,8 +39,8 @@
class Serial : public boost::asio::serial_port
{
public:
- Serial(boost::asio::io_service &io_service);
- Serial(boost::asio::io_service &io_service, const std::string &name, unsigned baud_rate);
+ Serial(boost::asio::io_context &io_service);
+ Serial(boost::asio::io_context &io_service, const std::string &name, unsigned baud_rate);
Serial(const Serial &) = delete;
Serial &operator=(const Serial &) = delete;
~Serial();
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/TCPConsole.cpp SuperSlicer-2.5.60.0/src/slic3r/Utils/TCPConsole.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/Utils/TCPConsole.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/Utils/TCPConsole.cpp 2025-01-05 00:06:50.954131426 +0100
@@ -4,6 +4,7 @@
#include <boost/asio/read_until.hpp>
#include <boost/asio/steady_timer.hpp>
#include <boost/asio/write.hpp>
+#include <boost/asio/connect.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/log/trivial.hpp>
@@ -156,7 +157,7 @@
auto endpoints = m_resolver.resolve(m_host_name, m_port_name);
- m_socket.async_connect(endpoints->endpoint(),
+ boost::asio::async_connect(m_socket, endpoints,
boost::bind(&TCPConsole::handle_connect, this, _1)
);

0
media-gfx/superslicer/files/superslicer-2.5.59.12-cereal.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-cereal.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-dont-install-angelscript.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-dont-install-angelscript.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-fix-compilation-error-gnu17.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-fix-compilation-error-gnu17.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-libnest2d-link-xcb.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-libnest2d-link-xcb.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-link-occtwrapper-statically.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-link-occtwrapper-statically.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-missing-includes-fix.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-missing-includes-fix.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-opencascade-7.8.0.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-opencascade-7.8.0.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-openexr3.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-openexr3.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-relax-OpenCASCADE-dep.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-relax-OpenCASCADE-dep.patch
View File

0
media-gfx/superslicer/files/superslicer-2.5.59.12-wxgtk3-wayland-fix.patch → media-gfx/superslicer/files/superslicer-2.5.60.0-wxgtk3-wayland-fix.patch
View File

12
media-gfx/superslicer/files/superslicer-2.5.60.0-wxwidgets-3.2.patch Normal file
View File

@ -0,0 +1,12 @@
diff '--color=auto' -urN SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/PhysicalPrinterDialog.cpp SuperSlicer-2.5.60.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp
--- SuperSlicer-2.5.60.0.orig/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2024-07-01 11:29:11.000000000 +0200
+++ SuperSlicer-2.5.60.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2025-01-04 23:38:20.276914468 +0100
@@ -564,7 +564,7 @@
// Always fill in the "printhost_port" combo box from the config and select it.
{
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
- choice->set_values({ m_config->opt_string("printhost_port") });
+ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
choice->set_selection();
}

1
media-gfx/superslicer/superslicer-2.5.59.12.ebuild → media-gfx/superslicer/superslicer-2.5.60.0.ebuild
View File

@ -67,6 +67,7 @@ PATCHES=(
"${FILESDIR}/${P}-libnest2d-link-xcb.patch"
"${FILESDIR}/${P}-boost-replace-load-string-file.patch"
"${FILESDIR}/${P}-opencascade-7.8.0.patch"
"${FILESDIR}/${P}-wxwidgets-3.2.patch"
)
# "${FILESDIR}/${P}-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch"
# "${FILESDIR}/${P}-additional-imports-fixes.patch"