prusaslicer: Patch to fix build after boost update with pkgsrc-2023Q1.

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sun Apr 9 12:46:41 2023 +1000
Changeset:	d3883498b35c5a6841e9148395da81b098a17de3

Modified Files:
	prusaslicer/distinfo
	prusaslicer/patches/patch-src_slic3r_GUI_PrintHostDialogs.cpp
Added Files:
	prusaslicer/patches/patch-src_hints_HintsToPot.cpp
	prusaslicer/patches/patch-tests_fff__print_test__data.cpp

Log Message:
prusaslicer: Patch to fix build after boost update with pkgsrc-2023Q1.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d3883498b35c5a6841e9148395da81b098a17de3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/distinfo                               |  4 +-
 prusaslicer/patches/patch-src_hints_HintsToPot.cpp | 16 ++++++++
 .../patch-src_slic3r_GUI_PrintHostDialogs.cpp      | 43 +++++++++++++++++++++-
 .../patches/patch-tests_fff__print_test__data.cpp  | 14 +++++++
 4 files changed, 75 insertions(+), 2 deletions(-)

diffs:
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 8cb2817d7b..528700a1fb 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -8,6 +8,7 @@ SHA1 (patch-cmake_modules_FindOpenVDB.cmake) = 4f2afc423a70fe60617b33ff7f26859b3
 SHA1 (patch-src_CMakeLists_txt) = 81526fa13d1a084e96bf1c4d546f677968ad4b74
 SHA1 (patch-src_avrdude_arduino.c) = ff02a4cab1c2d8c82ec7b22c7447ed5ec360ac57
 SHA1 (patch-src_avrdude_libavrdude.h) = 62d48054b147985249664f257dbd8bbd670df233
+SHA1 (patch-src_hints_HintsToPot.cpp) = d27de20ac1a2a424661ad772900be7b9506e794c
 SHA1 (patch-src_libslic3r_CMakeLists.txt) = bc82a71633adcb23dca4850d1076f99340030f2b
 SHA1 (patch-src_libslic3r_GCodeSender.cpp) = bd69c52e92ff85dba7f357eab62788a8e67a440e
 SHA1 (patch-src_libslic3r_LocalesUtils.cpp) = 33a473cadbc05eba7f0c218110e53babea36568c
@@ -36,10 +37,11 @@ SHA1 (patch-src_slic3r_GUI_NotificationManager.cpp) = 4e774bfdd777cba3e46ac4358b
 SHA1 (patch-src_slic3r_GUI_Plater.cpp) = 5235502df6c7227befd58e29de0b4a0ab7f1975f
 SHA1 (patch-src_slic3r_GUI_PresetComboBoxes.cpp) = 89654aa2e0384b35b61a19a22399683e7f4417ae
 SHA1 (patch-src_slic3r_GUI_PresetComboBoxes.hpp) = 0c84c1b706a1f4e00f60c1677c7edf53845d4467
-SHA1 (patch-src_slic3r_GUI_PrintHostDialogs.cpp) = 0fcdcd9f36202f4b8be169b214a4feb376da15a4
+SHA1 (patch-src_slic3r_GUI_PrintHostDialogs.cpp) = 0f5bc25dd1e96393274a2d882d80fcb3c4d26bdb
 SHA1 (patch-src_slic3r_GUI_RemovableDriveManager.cpp) = 413499908128be48106d5fd6aea5d413bb959b35
 SHA1 (patch-src_slic3r_GUI_Tab.cpp) = 6b615054719ad3bd3bfcc7e5c7c2a57ae5e66041
 SHA1 (patch-src_slic3r_GUI_UnsavedChangesDialog.cpp) = c2e4e2bfccd8492506c4f794b7085fa2c1cbe846
 SHA1 (patch-src_slic3r_GUI_UnsavedChangesDialog.hpp) = cb399a0d751be5c9b25fcf88554612a17bc44d3c
 SHA1 (patch-src_slic3r_GUI_wxExtensions.cpp) = 14a6b3c6a6c0b082b126dcaf1fc869404fa3e9c9
 SHA1 (patch-src_slic3r_Utils_Serial.cpp) = 77dbb4e3526e932c04b8020b6f808278d1319bdb
+SHA1 (patch-tests_fff__print_test__data.cpp) = 588e2a7ea980d82b7bb43eb7522b639101d0a337
diff --git a/prusaslicer/patches/patch-src_hints_HintsToPot.cpp b/prusaslicer/patches/patch-src_hints_HintsToPot.cpp
new file mode 100644
index 0000000000..b4dca1350d
--- /dev/null
+++ b/prusaslicer/patches/patch-src_hints_HintsToPot.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Upstream patch for boost deprecations:
+https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4
+
+--- src/hints/HintsToPot.cpp.orig	2023-03-13 13:20:26.000000000 +0000
++++ src/hints/HintsToPot.cpp
+@@ -9,7 +9,7 @@
+ 
+ bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
+ {
+-	boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
++	boost::nowide::ofstream file(path.string(), std::ios_base::app);
+ 	for (const auto& element : data)
+ 	{
+ 		//Example of .pot element 
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_PrintHostDialogs.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_PrintHostDialogs.cpp
index 0b46be5e16..4d4e60b683 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_PrintHostDialogs.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_PrintHostDialogs.cpp
@@ -2,8 +2,49 @@ $NetBSD$
 
 Treat NetBSD like Linux.
 
---- src/slic3r/GUI/PrintHostDialogs.cpp.orig	2022-03-10 10:35:03.000000000 +0000
+Upstream fix for boost deprecations:
+https://github.com/prusa3d/PrusaSlicer/issues/9294
+
+--- src/slic3r/GUI/PrintHostDialogs.cpp.orig	2023-03-13 13:20:26.000000000 +0000
 +++ src/slic3r/GUI/PrintHostDialogs.cpp
+@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
+     if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos)
+         m_valid_suffix = recent_path.substr(extension_start);
+     // .gcode suffix control
+-    auto validate_path = [this](const wxString &path) -> bool {
+-        if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
++    auto validate_path = [this](const std::wstring &path) -> bool {
++        if (! (new wxString(path))->Lower().EndsWith(m_valid_suffix.Lower())) {
+             MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
+             if (msg_wingow.ShowModal() == wxID_NO)
+                 return false;
+@@ -90,7 +90,7 @@ PrintHostSendDialog::PrintHostSendDialog
+ 
+     auto* btn_ok = add_button(wxID_OK, true, _L("Upload"));
+     btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-        if (validate_path(txt_filename->GetValue())) {
++        if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+             post_upload_action = PrintHostPostUploadAction::None;
+             EndDialog(wxID_OK);
+         }
+@@ -100,7 +100,7 @@ PrintHostSendDialog::PrintHostSendDialog
+     if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
+         auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
+         btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-            if (validate_path(txt_filename->GetValue())) {
++            if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+                 post_upload_action = PrintHostPostUploadAction::StartPrint;
+                 EndDialog(wxID_OK);
+             }
+@@ -111,7 +111,7 @@ PrintHostSendDialog::PrintHostSendDialog
+         // Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here.
+         auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate"));
+         btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-            if (validate_path(txt_filename->GetValue())) {
++            if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+                 post_upload_action = PrintHostPostUploadAction::StartSimulation;
+                 EndDialog(wxID_OK);
+             }        
 @@ -121,7 +121,7 @@ PrintHostSendDialog::PrintHostSendDialog
      add_button(wxID_CANCEL);
      finalize();
diff --git a/prusaslicer/patches/patch-tests_fff__print_test__data.cpp b/prusaslicer/patches/patch-tests_fff__print_test__data.cpp
new file mode 100644
index 0000000000..dee537adda
--- /dev/null
+++ b/prusaslicer/patches/patch-tests_fff__print_test__data.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Missing include.
+
+--- tests/fff_print/test_data.cpp.orig	2023-03-13 13:20:26.000000000 +0000
++++ tests/fff_print/test_data.cpp
+@@ -8,6 +8,7 @@
+ #include "libslic3r/Format/STL.hpp"
+ 
+ #include <cstdlib>
++#include <fstream>
+ #include <string>
+ 
+ #include <boost/nowide/cstdio.hpp>