diff --git a/PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch b/PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch new file mode 100644 index 0000000..e5f6886 --- /dev/null +++ b/PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch @@ -0,0 +1,37 @@ +From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001 +From: Gregor Riepl +Date: Mon, 27 Nov 2023 13:01:55 +0100 +Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString + overloads + +--- + src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +- + src/slic3r/GUI/Plater.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +index 2364c56247..bc2c918a60 100644 +--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp ++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +@@ -467,7 +467,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr + // Always fill in the "printhost_port" combo box from the config and select it. + { + Choice* choice = dynamic_cast(m_optgroup->get_field("printhost_port")); +- choice->set_values({ m_config->opt_string("printhost_port") }); ++ choice->set_values(std::vector({ m_config->opt_string("printhost_port") })); + choice->set_selection(); + } + +diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp +index c2b8e8694f..2f540bfe9d 100644 +--- a/src/slic3r/GUI/Plater.cpp ++++ b/src/slic3r/GUI/Plater.cpp +@@ -5390,7 +5390,7 @@ void Plater::load_project(const wxString& filename) + + p->reset(); + +- 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. diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index c0a5755..ffe5ea3 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 29 09:47:16 UTC 2023 - Ben Greiner + +- Add PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch + * Fixes a compilation error with wxWidgets 3.2.4 + * gh#prusa3d/PrusaSlicer#11769 + ------------------------------------------------------------------- Mon Dec 25 13:59:05 UTC 2023 - Ben Greiner diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index 86e6554..abfd78b 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -24,10 +24,12 @@ License: AGPL-3.0-only Group: Hardware/Printing 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-OPENSUSE up-occt-version.patch mike.chikov@gmail.com -- install wrapper so into libdir, not bindir -Patch0: up-occt-version.patch +Patch10: up-occt-version.patch # PATCH-FIX-OPENSUSE PrusaSlicer-2.6.0-octoprint-name-fix.patch -- cast lambda expression to same type -Patch1: PrusaSlicer-2.6.0-octoprint-name-fix.patch +Patch11: PrusaSlicer-2.6.0-octoprint-name-fix.patch BuildRequires: blosc-devel BuildRequires: cereal-devel BuildRequires: cgal-devel >= 5.6