Benjamin Greiner
78b41ed3d6
- Add gentoo-887055-boost-fix.patch * Fix build error with boost-filesystem 1.81 * gh#prusa3d/PrusaSlicer#9294 * https://bugs.gentoo.org/887055 OBS-URL: https://build.opensuse.org/request/show/1062331 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=55
50 lines
2.9 KiB
Diff
50 lines
2.9 KiB
Diff
From 6a714bb602a25290d2aedf74eb1232fb9efd5979 Mon Sep 17 00:00:00 2001
|
|
From: Piotr Karbowski <slashbeast@gentoo.org>
|
|
Date: Tue, 27 Dec 2022 21:11:19 +0100
|
|
Subject: media-gfx/prusaslicer: fix building with boost-1.81.
|
|
|
|
Patch contributed by Bradley Jarvis.
|
|
|
|
Closes: https://bugs.gentoo.org/887055
|
|
Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>
|
|
--- a/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:21:43.583075853 +1100
|
|
+++ b/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:23:03.902694287 +1100
|
|
@@ -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 (! 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);
|
|
}
|