diff --git a/PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch b/PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch index a212f3a..57fcd20 100644 --- a/PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch +++ b/PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch @@ -9,11 +9,11 @@ Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString src/slic3r/GUI/Plater.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp +Index: PrusaSlicer-version_2.9.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp =================================================================== ---- PrusaSlicer-version_2.8.0.orig/src/slic3r/GUI/PhysicalPrinterDialog.cpp -+++ PrusaSlicer-version_2.8.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp -@@ -606,7 +606,7 @@ void PhysicalPrinterDialog::build_printh +--- PrusaSlicer-version_2.9.0.orig/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2024-12-20 12:54:34.000000000 +0100 ++++ PrusaSlicer-version_2.9.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2024-12-20 15:32:12.247773628 +0100 +@@ -607,7 +607,7 @@ void PhysicalPrinterDialog::build_printh // Always fill in the "printhost_port" combo box from the config and select it. { Choice* choice = dynamic_cast(m_optgroup->get_field("printhost_port")); @@ -22,39 +22,24 @@ Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp choice->set_selection(); } -Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/Plater.cpp +Index: PrusaSlicer-version_2.9.0/src/slic3r/GUI/Plater.cpp =================================================================== ---- PrusaSlicer-version_2.8.0.orig/src/slic3r/GUI/Plater.cpp -+++ PrusaSlicer-version_2.8.0/src/slic3r/GUI/Plater.cpp -@@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString - - p->reset(); +--- PrusaSlicer-version_2.9.0.orig/src/slic3r/GUI/Plater.cpp 2024-12-20 12:54:34.000000000 +0100 ++++ PrusaSlicer-version_2.9.0/src/slic3r/GUI/Plater.cpp 2024-12-20 15:32:12.251106999 +0100 +@@ -4420,7 +4420,7 @@ void Plater::load_project(const wxString + s_multiple_beds.set_loading_project_flag(true); + ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);}); - if (! load_files({ into_path(filename) }).empty()) { + if (! load_files(std::vector({ into_path(filename) })).empty()) { // At least one file was loaded. p->set_project_filename(filename); // Save the names of active presets and project specific config into ProjectDirtyStateManager. - +Index: PrusaSlicer-version_2.9.0/src/slic3r/Utils/PrusaConnect.cpp =================================================================== -More of the same: -=================================================================== ---- a/src/slic3r/GUI/PrintHostDialogs.cpp -+++ b/src/slic3r/GUI/PrintHostDialogs.cpp -@@ -467,9 +467,7 @@ - wxVariant nm, hst; - job_list->GetValue(nm, evt.job_id, COL_FILENAME); - job_list->GetValue(hst, evt.job_id, COL_HOST); -- const wchar_t * nm_str = nm.GetString(); -- const wchar_t * hst_str = hst.GetString(); -- wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, into_u8(nm_str), into_u8(hst_str), evt.progress / 100.f); -+ wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, into_u8(nm.GetString()), into_u8(hst.GetString()), evt.progress / 100.f); - } - } - ---- a/src/slic3r/Utils/PrusaConnect.cpp -+++ b/src/slic3r/Utils/PrusaConnect.cpp -@@ -290,7 +290,7 @@ +--- PrusaSlicer-version_2.9.0.orig/src/slic3r/Utils/PrusaConnect.cpp 2024-12-20 12:54:34.000000000 +0100 ++++ PrusaSlicer-version_2.9.0/src/slic3r/Utils/PrusaConnect.cpp 2024-12-20 15:32:12.251106999 +0100 +@@ -256,7 +256,7 @@ bool PrusaConnectNew::get_storage(wxArra if (path && (!available || *available)) { StorageInfo si; si.path = boost::nowide::widen(*path); diff --git a/PrusaSlicer-2.8.1-pr13609-fix-build.patch b/PrusaSlicer-2.8.1-pr13609-fix-build.patch deleted file mode 100644 index 9bb4911..0000000 --- a/PrusaSlicer-2.8.1-pr13609-fix-build.patch +++ /dev/null @@ -1,321 +0,0 @@ -From bf17924d6582b8a7baca5a58e59c604f3288cd19 Mon Sep 17 00:00:00 2001 -From: randomtechguy <50642148+Rose-David@users.noreply.github.com> -Date: Fri, 12 Jul 2024 17:24:16 -0400 -Subject: [PATCH 1/5] Update CMakeLists.txt to fix linux compile error - ---- - src/slic3r/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index 82e91bb10b..b20583a5ba 100644 ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -391,6 +391,7 @@ set(SLIC3R_GUI_SOURCES - ) - - find_package(NanoSVG REQUIRED) -+find_package(OpenSSL REQUIRED) - - if (APPLE) - list(APPEND SLIC3R_GUI_SOURCES -@@ -447,6 +448,8 @@ target_link_libraries( - NanoSVG::nanosvgrast - stb_dxt - fastfloat -+ OpenSSL::SSL -+ OpenSSL::Crypto - ) - - if (MSVC) - -From da3587cea3c9b51f97f41e3eb09e4479d3b0492f Mon Sep 17 00:00:00 2001 -From: Jonne Mickelin -Date: Wed, 20 Nov 2024 16:05:44 +0100 -Subject: [PATCH 2/5] Update cmake/FindEigen3 to the one bundled with version - 3.4.0 - -This solves the build error with the missing `Eigen3::Eigen` build -target. - -Partially fixes #13608 ---- - cmake/modules/FindEigen3.cmake | 71 ++++++++++++++++++++++------------ - 1 file changed, 46 insertions(+), 25 deletions(-) - -diff --git a/cmake/modules/FindEigen3.cmake b/cmake/modules/FindEigen3.cmake -index 1da37619ef..2dbed58384 100644 ---- a/cmake/modules/FindEigen3.cmake -+++ b/cmake/modules/FindEigen3.cmake -@@ -9,6 +9,16 @@ - # EIGEN3_FOUND - system has eigen lib with correct version - # EIGEN3_INCLUDE_DIR - the eigen include directory - # EIGEN3_VERSION - eigen version -+# -+# and the following imported target: -+# -+# Eigen3::Eigen - The header-only Eigen library -+# -+# This module reads hints about search locations from -+# the following environment variables: -+# -+# EIGEN3_ROOT -+# EIGEN3_ROOT_DIR - - # Copyright (c) 2006, 2007 Montel Laurent, - # Copyright (c) 2008, 2009 Gael Guennebaud, -@@ -18,16 +28,16 @@ - if(NOT Eigen3_FIND_VERSION) - if(NOT Eigen3_FIND_VERSION_MAJOR) - set(Eigen3_FIND_VERSION_MAJOR 2) -- endif(NOT Eigen3_FIND_VERSION_MAJOR) -+ endif() - if(NOT Eigen3_FIND_VERSION_MINOR) - set(Eigen3_FIND_VERSION_MINOR 91) -- endif(NOT Eigen3_FIND_VERSION_MINOR) -+ endif() - if(NOT Eigen3_FIND_VERSION_PATCH) - set(Eigen3_FIND_VERSION_PATCH 0) -- endif(NOT Eigen3_FIND_VERSION_PATCH) -+ endif() - - set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") --endif(NOT Eigen3_FIND_VERSION) -+endif() - - macro(_eigen3_check_version) - file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header) -@@ -42,45 +52,56 @@ macro(_eigen3_check_version) - set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) - if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) - set(EIGEN3_VERSION_OK FALSE) -- else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) -+ else() - set(EIGEN3_VERSION_OK TRUE) -- endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) -+ endif() - - if(NOT EIGEN3_VERSION_OK) - - message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, " - "but at least version ${Eigen3_FIND_VERSION} is required") -- endif(NOT EIGEN3_VERSION_OK) --endmacro(_eigen3_check_version) -+ endif() -+endmacro() - - if (EIGEN3_INCLUDE_DIR) - - # in cache already - _eigen3_check_version() - set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) -- --else (EIGEN3_INCLUDE_DIR) -- -- # specific additional paths for some OS -- if (WIN32) -- set(EIGEN_ADDITIONAL_SEARCH_PATHS ${EIGEN_ADDITIONAL_SEARCH_PATHS} "C:/Program Files/Eigen/include" "C:/Program Files (x86)/Eigen/include") -- endif(WIN32) -- -- find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library -- PATHS -- ${CMAKE_INSTALL_PREFIX}/include -- ${EIGEN_ADDITIONAL_SEARCH_PATHS} -- ${KDE4_INCLUDE_DIR} -- PATH_SUFFIXES eigen3 eigen -- ) -+ set(Eigen3_FOUND ${EIGEN3_VERSION_OK}) -+ -+else () -+ -+ # search first if an Eigen3Config.cmake is available in the system, -+ # if successful this would set EIGEN3_INCLUDE_DIR and the rest of -+ # the script will work as usual -+ find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET) -+ -+ if(NOT EIGEN3_INCLUDE_DIR) -+ find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library -+ HINTS -+ ENV EIGEN3_ROOT -+ ENV EIGEN3_ROOT_DIR -+ PATHS -+ ${CMAKE_INSTALL_PREFIX}/include -+ ${KDE4_INCLUDE_DIR} -+ PATH_SUFFIXES eigen3 eigen -+ ) -+ endif() - - if(EIGEN3_INCLUDE_DIR) - _eigen3_check_version() -- endif(EIGEN3_INCLUDE_DIR) -+ endif() - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) - - mark_as_advanced(EIGEN3_INCLUDE_DIR) - --endif(EIGEN3_INCLUDE_DIR) -+endif() -+ -+if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen) -+ add_library(Eigen3::Eigen INTERFACE IMPORTED) -+ set_target_properties(Eigen3::Eigen PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}") -+endif() - -From 5c1fd3e489da10a6fb828681b2ee777736b45a61 Mon Sep 17 00:00:00 2001 -From: Jonne Mickelin -Date: Wed, 20 Nov 2024 16:11:11 +0100 -Subject: [PATCH 3/5] Replace FindDbus.cmake with the upstream module - -This solves the build error with missing headers. - -Partially fixes #13608. ---- - CMakeLists.txt | 2 +- - cmake/modules/FindDBus.cmake | 59 ------------------------------------ - src/slic3r/CMakeLists.txt | 2 +- - 3 files changed, 2 insertions(+), 61 deletions(-) - delete mode 100644 cmake/modules/FindDBus.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31cb4c0ff3..42a9302a0d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -246,7 +246,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - -- find_package(DBus REQUIRED) -+ find_package(DBus1 REQUIRED) - endif() - - if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX) -diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake -deleted file mode 100644 -index d54d4e516c..0000000000 ---- a/cmake/modules/FindDBus.cmake -+++ /dev/null -@@ -1,59 +0,0 @@ --# - Try to find DBus --# Once done, this will define --# --# DBUS_FOUND - system has DBus --# DBUS_INCLUDE_DIRS - the DBus include directories --# DBUS_LIBRARIES - link these to use DBus --# --# Copyright (C) 2012 Raphael Kubo da Costa --# --# Redistribution and use in source and binary forms, with or without --# modification, are permitted provided that the following conditions --# are met: --# 1. Redistributions of source code must retain the above copyright --# notice, this list of conditions and the following disclaimer. --# 2. Redistributions in binary form must reproduce the above copyright --# notice, this list of conditions and the following disclaimer in the --# documentation and/or other materials provided with the distribution. --# --# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS --# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, --# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR --# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS --# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, --# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, --# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; --# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, --# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR --# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF --# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- --FIND_PACKAGE(PkgConfig) --PKG_CHECK_MODULES(PC_DBUS QUIET dbus-1) -- --FIND_LIBRARY(DBUS_LIBRARIES -- NAMES dbus-1 -- HINTS ${PC_DBUS_LIBDIR} -- ${PC_DBUS_LIBRARY_DIRS} --) -- --FIND_PATH(DBUS_INCLUDE_DIR -- NAMES dbus/dbus.h -- HINTS ${PC_DBUS_INCLUDEDIR} -- ${PC_DBUS_INCLUDE_DIRS} --) -- --GET_FILENAME_COMPONENT(_DBUS_LIBRARY_DIR ${DBUS_LIBRARIES} PATH) --FIND_PATH(DBUS_ARCH_INCLUDE_DIR -- NAMES dbus/dbus-arch-deps.h -- HINTS ${PC_DBUS_INCLUDEDIR} -- ${PC_DBUS_INCLUDE_DIRS} -- ${_DBUS_LIBRARY_DIR} -- ${DBUS_INCLUDE_DIR} -- PATH_SUFFIXES include --) -- --SET(DBUS_INCLUDE_DIRS ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR}) -- --INCLUDE(FindPackageHandleStandardArgs) --FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBus REQUIRED_VARS DBUS_INCLUDE_DIRS DBUS_LIBRARIES) -\ No newline at end of file -diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index b20583a5ba..d1ce7b5b08 100644 ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -455,7 +455,7 @@ target_link_libraries( - if (MSVC) - target_link_libraries(libslic3r_gui PUBLIC Setupapi.lib) - elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") -- target_link_libraries(libslic3r_gui PUBLIC ${DBUS_LIBRARIES}) -+ target_link_libraries(libslic3r_gui PUBLIC ${DBus1_LIBRARIES}) - elseif (APPLE) - target_link_libraries(libslic3r_gui PUBLIC ${DISKARBITRATION_LIBRARY} ${COREWLAN_LIBRARY}) - endif() - -From f7a25cae1820444f4e999b429598ca477a35ccb8 Mon Sep 17 00:00:00 2001 -From: Jonne Mickelin -Date: Wed, 20 Nov 2024 16:14:07 +0100 -Subject: [PATCH 4/5] Link boost_headeronly in slic3r and libslic3r - -This solves the linker error about missing `boost::log` symbols. - -Fixes #13608. ---- - src/libslic3r/CMakeLists.txt | 3 ++- - src/slic3r/CMakeLists.txt | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt -index ea669ee30c..d80b17a0bc 100644 ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -524,7 +524,7 @@ cmake_policy(SET CMP0011 NEW) - find_package(CGAL REQUIRED) - cmake_policy(POP) - --add_library(libslic3r_cgal STATIC -+add_library(libslic3r_cgal STATIC - CutSurface.hpp CutSurface.cpp - Geometry/VoronoiUtilsCgal.hpp Geometry/VoronoiUtilsCgal.cpp - IntersectionPoints.hpp IntersectionPoints.cpp -@@ -596,6 +596,7 @@ target_link_libraries(libslic3r PUBLIC - libigl - agg - ankerl -+ boost_headeronly - ) - - if (APPLE) -diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index d1ce7b5b08..27c226120d 100644 ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -450,6 +450,7 @@ target_link_libraries( - fastfloat - OpenSSL::SSL - OpenSSL::Crypto -+ boost_headeronly - ) - - if (MSVC) - diff --git a/PrusaSlicer-2.9.0-pr13885-printconfig-segfault.patch b/PrusaSlicer-2.9.0-pr13885-printconfig-segfault.patch new file mode 100644 index 0000000..ebac94c --- /dev/null +++ b/PrusaSlicer-2.9.0-pr13885-printconfig-segfault.patch @@ -0,0 +1,30 @@ +From aaa7ab6ca2b593a4f20a08292a6fb44339029474 Mon Sep 17 00:00:00 2001 +From: Ryan Heule +Date: Wed, 1 Jan 2025 16:36:04 -0600 +Subject: [PATCH] Avoid null pointer dereference for partial configuration + settings + +--- + src/libslic3r/PrintConfig.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp +index 907fdfb02a..efa9be9760 100644 +--- a/src/libslic3r/PrintConfig.cpp ++++ b/src/libslic3r/PrintConfig.cpp +@@ -5130,7 +5130,14 @@ void DynamicPrintConfig::normalize_fdm() + } + } + +- if (this->has("wipe_tower_extruder")) { ++ // This method is called repeatedly while building configuration. We may ++ // not have enough info yet to determine whether the extruder is valid; ++ // wait until we do before checking. ++ // ++ // NOTE: other extruder validation (e.g. perimeter_extruder, infill_extruder) ++ // happens elsewhere, as those settings can be modified for specific print ++ // objects or sometimes even regions of objects. ++ if (this->has("wipe_tower_extruder") && this->has("nozzle_diameter")) { + // If invalid, replace with 0. + int extruder = this->opt("wipe_tower_extruder")->value; + int num_extruders = this->opt("nozzle_diameter")->size(); diff --git a/PrusaSlicer-2.9.0-pr13896-static-libs.patch b/PrusaSlicer-2.9.0-pr13896-static-libs.patch new file mode 100644 index 0000000..cd23fe6 --- /dev/null +++ b/PrusaSlicer-2.9.0-pr13896-static-libs.patch @@ -0,0 +1,46 @@ +From a7c15a3ae9877dcf7da8c8fd80de8b128251db2b Mon Sep 17 00:00:00 2001 +From: Yuri D'Elia +Date: Fri, 3 Jan 2025 00:07:50 +0100 +Subject: [PATCH] Build libslic3r-arrange/wrapper as static + +Fix build on linux without SLIC3R_STATIC (these are for internal use +only). + +- Avoids the need for installation (fixes + https://github.com/prusa3d/PrusaSlicer/pull/13812) +- Fixes build without PIC (fixes + https://github.com/prusa3d/PrusaSlicer/pull/13810, + https://github.com/prusa3d/PrusaSlicer/issues/13694), which would + still result in broken behavior (duplicate static initialization + crashing on startup). +--- + src/slic3r-arrange-wrapper/CMakeLists.txt | 2 +- + src/slic3r-arrange/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/slic3r-arrange-wrapper/CMakeLists.txt b/src/slic3r-arrange-wrapper/CMakeLists.txt +index 3f723e5aed1..34b64fc2969 100644 +--- a/src/slic3r-arrange-wrapper/CMakeLists.txt ++++ b/src/slic3r-arrange-wrapper/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(slic3r-arrange-wrapper) + cmake_minimum_required(VERSION 3.13) + +-add_library(slic3r-arrange-wrapper ++add_library(slic3r-arrange-wrapper STATIC + include/arrange-wrapper/Arrange.hpp + include/arrange-wrapper/ArrangeSettingsDb_AppCfg.hpp + include/arrange-wrapper/ArrangeSettingsView.hpp +diff --git a/src/slic3r-arrange/CMakeLists.txt b/src/slic3r-arrange/CMakeLists.txt +index 98ab2470535..36a54ca5985 100644 +--- a/src/slic3r-arrange/CMakeLists.txt ++++ b/src/slic3r-arrange/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(slic3r-arrange) + cmake_minimum_required(VERSION 3.13) + +-add_library(slic3r-arrange ++add_library(slic3r-arrange STATIC + include/arrange/Beds.hpp + include/arrange/ArrangeItemTraits.hpp + include/arrange/PackingContext.hpp diff --git a/PrusaSlicer-version_2.8.1.tar.gz b/PrusaSlicer-version_2.8.1.tar.gz deleted file mode 100644 index 71df7f5..0000000 --- a/PrusaSlicer-version_2.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f71033dd4e9fdd8e5ac7b5be5803d0d6d09ec0fd87de92b152b3c6bbae04c103 -size 69409077 diff --git a/PrusaSlicer-version_2.9.0.tar.gz b/PrusaSlicer-version_2.9.0.tar.gz new file mode 100644 index 0000000..300ae5f --- /dev/null +++ b/PrusaSlicer-version_2.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:515a41dea3bcd2fcadb713b22e4eccfd46fbb7a7ca8dad8440e7b5e29fbbc206 +size 70604482 diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 889493b..9c6fb4f 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Dec 20 18:27:35 UTC 2024 - Andreas Schneider + +- Update to version 2.9.0 + * This release introduces multiple beds, scarf seams, Printables integration, + improved support for multiple nozzle diameters, paint-on fuzzy skin and + many more improvements and bugfixes. + * See https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.9.0 +- Added PrusaSlicer-2.9.0-pr13896-static-libs.patch + gh#prusa3d/PrusaSlicer#13896 +- Added PrusaSlicer-2.9.0-pr13885-printconfig-segfault.patch + gh#prusa3d/PrusaSlicer#13885 +- Removed PrusaSlicer-2.8.1-pr13609-fix-build.patch + ------------------------------------------------------------------- Sun Dec 15 11:12:17 UTC 2024 - Andreas Schneider diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index b859d31..8ee162d 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -1,7 +1,7 @@ # # spec file for package PrusaSlicer # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: PrusaSlicer -Version: 2.8.1 +Version: 2.9.0 Release: 0 Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) License: AGPL-3.0-only @@ -27,12 +27,14 @@ URL: https://www.prusa3d.com/prusaslicer/ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-version_%{version}.tar.gz # PATCH-FIX-UPSTREAM PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch gh#prusa3d/PrusaSlicer#11769 Patch1: PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch -# PATCH-FIX-UPSTREAM PrusaSlicer-2.8.1-pr13609-fix-build.patch gh#prusa3d/PrusaSlicer#13609 -Patch2: PrusaSlicer-2.8.1-pr13609-fix-build.patch # PATCH-FIX-OPENSUSE PrusaSlicer-2.8.1-pr13761-fix-occtwrapper.patch gh#prusa3d/PrusaSlicer#13761 Patch10: PrusaSlicer-2.8.1-pr13761-fix-occtwrapper.patch # PATCH-FIX-OPENSUSE PrusaSlicer-2.6.0-octoprint-name-fix.patch -- cast lambda expression to same type Patch11: PrusaSlicer-2.6.0-octoprint-name-fix.patch +# PATCH-FIX-OPENSUSE PrusaSlicer-2.9.0-pr13896-static-libs.patch gh#prusa3d/PrusaSlicer#13896 +Patch12: PrusaSlicer-2.9.0-pr13896-static-libs.patch +# PATCH-FIX-OPENSUSE PrusaSlicer-2.9.0-pr13885-printconfig-segfault.patch gh#prusa3d/PrusaSlicer#13885 +Patch13: PrusaSlicer-2.9.0-pr13885-printconfig-segfault.patch BuildRequires: blosc-devel BuildRequires: cereal-devel BuildRequires: cgal-devel >= 5.6 @@ -74,12 +76,12 @@ BuildRequires: wxGTK3-devel >= 3.2 BuildRequires: nanosvg-devel >= 2022.12.22 BuildRequires: (cmake(Catch2) >= 2.9 with cmake(Catch2) < 3) BuildRequires: cmake(LibBGCode) +BuildRequires: cmake(Qhull) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(qhull_r) BuildRequires: pkgconfig(qhullcpp) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl)