diff options
| author | Nuno Teixeira <eduardo@FreeBSD.org> | 2023-11-22 10:38:56 +0000 |
|---|---|---|
| committer | Nuno Teixeira <eduardo@FreeBSD.org> | 2023-11-22 11:15:15 +0000 |
| commit | 8d2fe51b145a2d8117b7a3b8baf0b2b76d01d27d (patch) | |
| tree | a7a569526226264ad86ee4f21067eef65ef4bb12 | |
| parent | 11f783075eabf2e7c00d45290ea66d6314c26258 (diff) | |
| download | ports-8d2fe51b145a2d8117b7a3b8baf0b2b76d01d27d.tar.gz ports-8d2fe51b145a2d8117b7a3b8baf0b2b76d01d27d.zip | |
cad/PrusaSlicer: Fix build with wxWidgets 3.2.4
- Patches taken from OpenBSD port
PR: 274367, 275082
Approved by: portmgr (build fix blanket)
MFH: 2023Q4
(cherry picked from commit 818c20c1aa833f8f648f80c77f4eb3aafdb00299)
| -rw-r--r-- | cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp | 11 | ||||
| -rw-r--r-- | cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp | 11 |
2 files changed, 21 insertions, 1 deletions
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp new file mode 100644 index 000000000000..c8ba4b736e20 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp @@ -0,0 +1,11 @@ +--- src/slic3r/GUI/PhysicalPrinterDialog.cpp.orig 2023-06-19 12:07:14 UTC ++++ src/slic3r/GUI/PhysicalPrinterDialog.cpp +@@ -458,7 +458,7 @@ void PhysicalPrinterDialog::build_printhost_settings(C + // 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((const std::vector<std::string>){ m_config->opt_string("printhost_port") }); + choice->set_selection(); + } + diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp index e302f0946508..8144dab1bbfb 100644 --- a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp +++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp @@ -1,4 +1,4 @@ ---- src/slic3r/GUI/Plater.cpp.orig 2023-07-25 12:32:07 UTC +--- src/slic3r/GUI/Plater.cpp.orig 2023-06-19 12:07:14 UTC +++ src/slic3r/GUI/Plater.cpp @@ -2452,7 +2452,7 @@ std::vector<size_t> Plater::priv::load_files(const std // when loading a project file. However, creating the dialog on heap causes issues on macOS, where it does not @@ -27,3 +27,12 @@ // For some reason on Linux the menu isn't displayed if position is // specified (even though the position is sane). position = wxDefaultPosition; +@@ -5281,7 +5281,7 @@ void Plater::load_project(const wxString& filename) + + p->reset(); + +- if (! load_files({ into_path(filename) }).empty()) { ++ if (! load_files((const std::vector<boost::filesystem::path>){ 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. |