diff options
Diffstat (limited to 'cad/PrusaSlicer')
5 files changed, 30 insertions, 28 deletions
diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 7b3a95bf3e66..b9336618cecf 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,7 +1,7 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.9.2 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= cad DIST_SUBDIR= PrusaSlicer @@ -61,7 +61,8 @@ CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DSLIC3R_GTK=3 \ -DSLIC3R_FHS=1 \ -DSLIC3R_PCH=OFF \ - -DSLIC3R_BUILD_TESTS=OFF + -DSLIC3R_BUILD_TESTS=OFF \ + -Wno-dev PORTDATA= * post-patch: 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_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))); |