From 8a4af427075f66baf4fedbbaba03ffc7f3f1f536 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Wed, 15 Sep 2021 12:30:06 +0300 Subject: cad/PrusaSlicer: Update to 2.3.3 - Update to 2.3.3 - Change the dependency from devel/tbb to devel/onetbb ChangeLog: https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.3.3 PR: 258483 Submitted by: Steve Wills Reported by: teodorsigaev@gmail.com (tested), eborisch+FreeBSD@gmail.com (tested) --- ...tch-src_slic3r_GUI_BackgroundSlicingProcess.cpp | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp (limited to 'cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp') diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp new file mode 100644 index 000000000000..f56446391229 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp @@ -0,0 +1,29 @@ +--- src/slic3r/GUI/BackgroundSlicingProcess.cpp.orig 2021-07-16 10:14:03 UTC ++++ src/slic3r/GUI/BackgroundSlicingProcess.cpp +@@ -465,7 +465,7 @@ void BackgroundSlicingProcess::schedule_export(const s + return; + + // Guard against entering the export step before changing the export path. +- tbb::mutex::scoped_lock lock(m_print->state_mutex()); ++ std::scoped_lock lock(m_print->state_mutex()); + this->invalidate_step(bspsGCodeFinalize); + m_export_path = path; + m_export_path_on_removable_media = export_path_on_removable_media; +@@ -478,7 +478,7 @@ void BackgroundSlicingProcess::schedule_upload(Slic3r: + return; + + // Guard against entering the export step before changing the export path. +- tbb::mutex::scoped_lock lock(m_print->state_mutex()); ++ std::scoped_lock lock(m_print->state_mutex()); + this->invalidate_step(bspsGCodeFinalize); + m_export_path.clear(); + m_upload_job = std::move(upload_job); +@@ -491,7 +491,7 @@ void BackgroundSlicingProcess::reset_export() + m_export_path.clear(); + m_export_path_on_removable_media = false; + // invalidate_step expects the mutex to be locked. +- tbb::mutex::scoped_lock lock(m_print->state_mutex()); ++ std::scoped_lock lock(m_print->state_mutex()); + this->invalidate_step(bspsGCodeFinalize); + } + } -- cgit v1.2.3