On Sat, Nov 18 2023, Ian Darwin <i...@darwinsys.com> wrote:
> On Fri, Nov 17, 2023 at 12:26:08AM +0100, Christian Weisgerber wrote:
>> Updated list:
>>
>> cad/prusaslicer C++ ambiguous function call
>
> Unbreak: Resolve two ambiguous overloads triggered by recent
> header changes and detected after switch to clang 16.
>
> ok?
Looks like your patches were generated using diff -c, which I think
makes them look alien to most of us. :)
Here's a diff done with make update-patches, also adding
a REVISION bump (better safe than sorry).
The src/slic3r/GUI/Plater.cpp change makes sense to me given the error
message. My amd64 build machine hasn't reached this port yet, but
I suggest you don't wait too much for feedback: the port is currently
broken anyway.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/cad/prusaslicer/Makefile,v
diff -u -p -r1.5 Makefile
--- Makefile 13 Nov 2023 20:06:47 -0000 1.5
+++ Makefile 20 Nov 2023 12:53:41 -0000
@@ -4,6 +4,7 @@ DPB_PROPERTIES = parallel
V = 2.6.1
PKGNAME = prusaslicer-${V}
+REVISION = 0
GH_ACCOUNT = prusa3d
GH_PROJECT = PrusaSlicer
Index: patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp
===================================================================
RCS file: patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp
diff -N patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp 20 Nov 2023
12:53:11 -0000
@@ -0,0 +1,12 @@
+Index: src/slic3r/GUI/PhysicalPrinterDialog.cpp
+--- src/slic3r/GUI/PhysicalPrinterDialog.cpp.orig
++++ src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -462,7 +462,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();
+ }
+
Index: patches/patch-src_slic3r_GUI_Plater_cpp
===================================================================
RCS file: patches/patch-src_slic3r_GUI_Plater_cpp
diff -N patches/patch-src_slic3r_GUI_Plater_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_slic3r_GUI_Plater_cpp 20 Nov 2023 12:53:14 -0000
@@ -0,0 +1,12 @@
+Index: src/slic3r/GUI/Plater.cpp
+--- src/slic3r/GUI/Plater.cpp.orig
++++ src/slic3r/GUI/Plater.cpp
+@@ -5310,7 +5310,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.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
