summaryrefslogtreecommitdiff
path: root/cad/PrusaSlicer/files
diff options
context:
space:
mode:
Diffstat (limited to 'cad/PrusaSlicer/files')
-rw-r--r--cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake32
-rw-r--r--cad/PrusaSlicer/files/patch-src_libseqarrange_src_seq__sequential.cpp19
-rw-r--r--cad/PrusaSlicer/files/patch-src_libslic3r_GCode_PostProcessor.cpp17
-rw-r--r--cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt9
-rw-r--r--cad/PrusaSlicer/files/patch-src_slic3r_GUI_GLCanvas3D.cpp4
-rw-r--r--cad/PrusaSlicer/files/patch-src_slic3r_GUI_Preferences.cpp6
-rw-r--r--cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDatabase.cpp11
-rw-r--r--cad/PrusaSlicer/files/patch-src_slic3r_GUI_RemovableDriveManager.cpp21
8 files changed, 91 insertions, 28 deletions
diff --git a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
index 02a12d73302b..142237d5aafd 100644
--- a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
+++ b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
@@ -1,28 +1,23 @@
---- cmake/modules/FindOpenVDB.cmake.orig 2025-02-14 18:26:40 UTC
+--- cmake/modules/FindOpenVDB.cmake.orig 2025-04-10 11:26:51 UTC
+++ cmake/modules/FindOpenVDB.cmake
-@@ -347,24 +347,24 @@ endmacro()
+@@ -347,24 +347,12 @@ endmacro()
return()
endmacro()
-find_package(IlmBase QUIET)
-if(NOT IlmBase_FOUND)
- pkg_check_modules(IlmBase QUIET IlmBase)
-+find_package(Imath QUIET COMPONENTS Half)
++find_package(Imath QUIET COMPONENTS Imath)
+if(NOT Imath_FOUND)
+ pkg_check_modules(Imath QUIET Imath)
endif()
-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
- message(STATUS "Falling back to IlmBase found by pkg-config...")
-+if (Imath_FOUND AND NOT TARGET Imath::Half)
-+ message(STATUS "Falling back to Imath 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!")
-+ find_library(Imath_LIBRARY NAMES Imath)
-+ if(Imath_LIBRARY-NOTFOUND OR NOT Imath_INCLUDE_DIRS)
-+ just_fail("Imath::Half can not be found!")
- endif()
+- endif()
-
- add_library(IlmBase::Half UNKNOWN IMPORTED)
- set_target_properties(IlmBase::Half PROPERTIES
@@ -30,17 +25,12 @@
- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
-elseif(NOT IlmBase_FOUND)
- just_fail("IlmBase::Half can not be found!")
-+
-+ add_library(Imath::Half UNKNOWN IMPORTED)
-+ set_target_properties(Imath::Half PROPERTIES
-+ IMPORTED_LOCATION "${Imath_LIBRARY}"
-+ INTERFACE_INCLUDE_DIRECTORIES "${Imath_INCLUDE_DIRS}")
-+elseif(NOT Imath_FOUND)
++if(NOT Imath_FOUND)
+ just_fail("Imath::Half can not be found!")
endif()
find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
find_package(ZLIB ${_quiet} ${_required})
-@@ -451,7 +451,7 @@ if(OpenVDB_USES_ILM)
+@@ -451,7 +439,7 @@ if(OpenVDB_USES_ILM)
endif()
if(OpenVDB_USES_ILM)
@@ -49,7 +39,7 @@
endif()
if(OpenVDB_USES_EXR)
-@@ -463,7 +463,7 @@ endif()
+@@ -463,7 +451,7 @@ endif()
endif()
# Set deps. Note that the order here is important. If we're building against
@@ -58,16 +48,16 @@
# users chosen namespaced headers are correctly prioritized. Otherwise other
# include paths from shared installs (including houdini) may pull in the wrong
# headers
-@@ -471,7 +471,7 @@ set(_OPENVDB_VISIBLE_DEPENDENCIES
+@@ -471,7 +459,7 @@ set(_OPENVDB_VISIBLE_DEPENDENCIES
set(_OPENVDB_VISIBLE_DEPENDENCIES
Boost::iostreams
Boost::system
- IlmBase::Half
-+ Imath::Half
++ Imath::Imath
)
set(_OPENVDB_DEFINITIONS)
-@@ -481,10 +481,10 @@ if(OpenVDB_USES_EXR)
+@@ -481,10 +469,10 @@ if(OpenVDB_USES_EXR)
if(OpenVDB_USES_EXR)
list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
diff --git a/cad/PrusaSlicer/files/patch-src_libseqarrange_src_seq__sequential.cpp b/cad/PrusaSlicer/files/patch-src_libseqarrange_src_seq__sequential.cpp
new file mode 100644
index 000000000000..6172b75bfd54
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_libseqarrange_src_seq__sequential.cpp
@@ -0,0 +1,19 @@
+--- src/libseqarrange/src/seq_sequential.cpp.orig 2025-07-01 13:42:42 UTC
++++ src/libseqarrange/src/seq_sequential.cpp
+@@ -11679,11 +11679,11 @@ bool optimize_SubglobalConsequentialPolygonNonoverlapp
+ {
+ printf(" %d\n", undecided[j]);
+ }
+- printf("Missing\n");
+- for (unsigned int j = 0; j < missing.size(); ++j)
+- {
+- printf(" %d\n", missing[j]);
+- }
++// printf("Missing\n");
++// for (unsigned int j = 0; j < missing.size(); ++j)
++// {
++// printf(" %d\n", missing[j]);
++// }
+ printf("Decided\n");
+ for (unsigned int j = 0; j < decided_polygons.size(); ++j)
+ {
diff --git a/cad/PrusaSlicer/files/patch-src_libslic3r_GCode_PostProcessor.cpp b/cad/PrusaSlicer/files/patch-src_libslic3r_GCode_PostProcessor.cpp
new file mode 100644
index 000000000000..ee61828cf992
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_libslic3r_GCode_PostProcessor.cpp
@@ -0,0 +1,17 @@
+--- src/libslic3r/GCode/PostProcessor.cpp.orig 2025-04-10 11:26:51 UTC
++++ src/libslic3r/GCode/PostProcessor.cpp
+@@ -152,7 +152,14 @@ static int run_script(const std::string &script, const
+
+ #include <cstdlib> // getenv()
+ #include <sstream>
++#if BOOST_VERSION >= 108800 // v2 is now default
++#define BOOST_PROCESS_VERSION 1
++#include <boost/process/v1/child.hpp>
++#include <boost/process/v1/io.hpp>
++#include <boost/process/v1/pipe.hpp>
++#else
+ #include <boost/process.hpp>
++#endif
+
+ namespace process = boost::process;
+
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt
index 461c58254e17..ea3b96034d5e 100644
--- a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt
+++ b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt
@@ -62,3 +62,12 @@
target_link_libraries(libslic3r_gui PUBLIC
${DBus1_LIBRARIES}
OpenSSL::SSL
+@@ -488,7 +507,7 @@ if (UNIX AND NOT APPLE)
+ find_package(GTK${SLIC3R_GTK} REQUIRED)
+ find_package(PkgConfig REQUIRED)
+
+- pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.0 webkit2gtk-4.1)
++ pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.1)
+ target_link_libraries(libslic3r_gui PUBLIC ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig PkgConfig::WEBKIT2GTK)
+ endif ()
+
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_GLCanvas3D.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_GLCanvas3D.cpp
index a08546fb6152..24adaa7d568b 100644
--- a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_GLCanvas3D.cpp
+++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_GLCanvas3D.cpp
@@ -1,6 +1,6 @@
---- src/slic3r/GUI/GLCanvas3D.cpp.orig 2025-02-20 18:44:48 UTC
+--- src/slic3r/GUI/GLCanvas3D.cpp.orig 2025-04-10 11:26:51 UTC
+++ src/slic3r/GUI/GLCanvas3D.cpp
-@@ -13,7 +13,7 @@
+@@ -18,7 +18,7 @@
#include <igl/unproject.h> // IWYU pragma: keep
#include <LocalesUtils.hpp>
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Preferences.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Preferences.cpp
index 9a78a4c1706e..9d3cd1e03b38 100644
--- a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Preferences.cpp
+++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Preferences.cpp
@@ -9,7 +9,7 @@
#include "DesktopIntegrationDialog.hpp"
#endif //(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
-@@ -270,7 +270,7 @@ void PreferencesDialog::build()
+@@ -271,7 +271,7 @@ void PreferencesDialog::build()
tabs = new Notebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME | wxNB_DEFAULT);
#else
tabs = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL |wxNB_NOPAGETHEME | wxNB_DEFAULT );
@@ -18,7 +18,7 @@
tabs->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [this](wxBookCtrlEvent& e) {
e.Skip();
CallAfter([this]() { tabs->GetCurrentPage()->Layout(); });
-@@ -750,7 +750,7 @@ void PreferencesDialog::accept(wxEvent&)
+@@ -756,7 +756,7 @@ void PreferencesDialog::accept(wxEvent&)
downloader->allow(it->second == "1");
if (!downloader->on_finish())
return;
@@ -27,7 +27,7 @@
if(DownloaderUtils::Worker::perform_registration_linux)
DesktopIntegrationDialog::perform_downloader_desktop_integration();
#endif //(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
-@@ -1108,7 +1108,7 @@ void PreferencesDialog::create_settings_font_widget()
+@@ -1114,7 +1114,7 @@ void PreferencesDialog::create_settings_font_widget()
font_example->SetFont(font);
m_values[opt_key] = format("%1%", val);
stb_sizer->Layout();
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDatabase.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDatabase.cpp
new file mode 100644
index 000000000000..cf5b7fe70309
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDatabase.cpp
@@ -0,0 +1,11 @@
+--- src/slic3r/GUI/PresetArchiveDatabase.cpp.orig 2025-07-04 16:42:20 UTC
++++ src/slic3r/GUI/PresetArchiveDatabase.cpp
+@@ -577,7 +577,7 @@ void PresetArchiveDatabase::load_app_manifest_json()
+ if (const auto used = subtree.second.get_optional<bool>("has_installed_printers"); used) {
+ m_has_installed_printer_repositories_uuid[uuid] = *used;
+ } else {
+- assert(false);
++// assert(false);
+ m_has_installed_printer_repositories_uuid[uuid] = false;
+ }
+ m_archive_repositories.emplace_back(std::make_unique<OnlineArchiveRepository>(std::move(uuid), std::move(manifest)));
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_RemovableDriveManager.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_RemovableDriveManager.cpp
index e22a92115ac8..a9b16619989d 100644
--- a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_RemovableDriveManager.cpp
+++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_RemovableDriveManager.cpp
@@ -1,6 +1,23 @@
---- src/slic3r/GUI/RemovableDriveManager.cpp.orig 2024-12-20 11:54:34 UTC
+--- src/slic3r/GUI/RemovableDriveManager.cpp.orig 2025-04-10 11:26:51 UTC
+++ src/slic3r/GUI/RemovableDriveManager.cpp
-@@ -743,7 +743,7 @@ namespace search_for_drives_internal
+@@ -35,8 +35,16 @@
+ #include <pwd.h>
+ #include <boost/filesystem.hpp>
+ #include <boost/system/error_code.hpp>
++#if BOOST_VERSION >= 108800 // v2 is now default
++#define BOOST_PROCESS_VERSION 1
++#include <boost/process/v1/child.hpp>
++#include <boost/process/v1/io.hpp>
++//#include <boost/process/v1/pipe.hpp>
++#include <boost/process/v1/search_path.hpp>
++#else
+ #include <boost/process.hpp>
+ #endif
++#endif
+
+ namespace Slic3r {
+ namespace GUI {
+@@ -743,7 +751,7 @@ namespace search_for_drives_internal
//confirms if the file is removable drive and adds it to vector
if (
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 02:26:03 +0000