wip/prusaslicer: Fix compile errors on netbsd-9.

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

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Wed Aug 18 16:47:06 2021 +1000
Changeset:	fd9ba92683c81636060542f4f87a9be0351f3125

Modified Files:
	prusaslicer/distinfo
	prusaslicer/patches/patch-src_libslic3r_SLA_Concurrency.hpp
	prusaslicer/patches/patch-src_libslic3r_pchheader.hpp
	prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
	prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.hpp

Log Message:
wip/prusaslicer: Fix compile errors on netbsd-9.

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

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

diffstat:
 prusaslicer/distinfo                                         |  8 ++++----
 prusaslicer/patches/patch-src_libslic3r_SLA_Concurrency.hpp  |  9 +++++++--
 prusaslicer/patches/patch-src_libslic3r_pchheader.hpp        | 10 +++++++++-
 .../patches/patch-src_slic3r_GUI_Mouse3DController.hpp       | 12 +++++++-----
 .../patches/patch-src_slic3r_GUI_RemovableDriveManager.hpp   |  9 +++++++--
 5 files changed, 34 insertions(+), 14 deletions(-)

diffs:
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 905f64b946..00c9b8bcb6 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -18,17 +18,17 @@ SHA1 (patch-src_libslic3r_PrintBase.cpp) = d6f6983933215a0b95e390cef32dcb33d5bec
 SHA1 (patch-src_libslic3r_PrintBase.hpp) = 0cef36de09752e3f956e1ff8a2d4301b31747e0e
 SHA1 (patch-src_libslic3r_PrintObject.cpp) = 491a8966d3b6b92d9ab8fd6186e61f9743a30463
 SHA1 (patch-src_libslic3r_SLAPrint.cpp) = d1cb835e529e76d9ace89673a6bfabe8051ce899
-SHA1 (patch-src_libslic3r_SLA_Concurrency.hpp) = 455b94ed2d5311d292b3667ebb1756715790c6d5
+SHA1 (patch-src_libslic3r_SLA_Concurrency.hpp) = 5ed50b06bbe5c5b08b3e473586d76d0813eaf265
 SHA1 (patch-src_libslic3r_SLA_SupportTree.cpp) = 4d9929c06f3d23e795b71687d0ac1d4e4823934b
 SHA1 (patch-src_libslic3r_SupportMaterial.cpp) = 57783d96e293993ea9cf264c5ba4061f6c1b881a
 SHA1 (patch-src_libslic3r_Thread.cpp) = fc6b7bc4fb0f1ddc1409e824898ba5259f0da72d
-SHA1 (patch-src_libslic3r_pchheader.hpp) = 5e456ec2607ea13ee51250ba5ca735f6bab03e7f
+SHA1 (patch-src_libslic3r_pchheader.hpp) = 8235c1d973bbf5bd3accba96f8d4519793495f87
 SHA1 (patch-src_libslic3r_utils.cpp) = 1ae1daa5146d04c907cd88c2b6618345fc79719f
 SHA1 (patch-src_slic3r_GUI_BackgroundSlicingProcess.cpp) = f7ea43adb2da1d5776e58dd18a8ec041a6eabe5a
 SHA1 (patch-src_slic3r_GUI_BackgroundSlicingProcess.hpp) = cad5e01db6cabea14b332e8e1c14ef1e50e530a9
 SHA1 (patch-src_slic3r_GUI_InstanceCheck.cpp) = c9ae1ec2db2b493578cc128383fa4cf0b3e2ae6a
 SHA1 (patch-src_slic3r_GUI_InstanceCheck.hpp) = e87206bc16155d575cf6b258c52429215c1b2c0c
 SHA1 (patch-src_slic3r_GUI_Mouse3DController.cpp) = 41018efeba4c0d5904df5d5df59db1540183a0fe
-SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = 35393bcbde4bccafb26ab0bc636b95053ff02762
+SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = e99c46c4424d1087fbe0ca17504d2302e5662928
 SHA1 (patch-src_slic3r_GUI_RemovableDriveManager.cpp) = d54f0b7f62623cb745786526c6424ac53e6b6630
-SHA1 (patch-src_slic3r_GUI_RemovableDriveManager.hpp) = a7f2c4745e14f375959afcec68c8d6dec1b514cd
+SHA1 (patch-src_slic3r_GUI_RemovableDriveManager.hpp) = 4999ee81ab603dc513494ccf65dcf6c3a015bbbd
diff --git a/prusaslicer/patches/patch-src_libslic3r_SLA_Concurrency.hpp b/prusaslicer/patches/patch-src_libslic3r_SLA_Concurrency.hpp
index de482d3f49..8612786cff 100644
--- a/prusaslicer/patches/patch-src_libslic3r_SLA_Concurrency.hpp
+++ b/prusaslicer/patches/patch-src_libslic3r_SLA_Concurrency.hpp
@@ -4,7 +4,7 @@ Migrate from deprecated tbb::mutex to std::mutex.
 
 --- src/libslic3r/SLA/Concurrency.hpp.orig	2021-07-16 10:14:03.000000000 +0000
 +++ src/libslic3r/SLA/Concurrency.hpp
-@@ -2,7 +2,6 @@
+@@ -2,11 +2,11 @@
  #define SLA_CONCURRENCY_H
  
  #include <tbb/spin_mutex.h>
@@ -12,7 +12,12 @@ Migrate from deprecated tbb::mutex to std::mutex.
  #include <tbb/parallel_for.h>
  #include <tbb/parallel_reduce.h>
  
-@@ -23,7 +22,7 @@ template<bool> struct _ccr {};
+ #include <algorithm>
++#include <mutex>
+ #include <numeric>
+ 
+ #include <libslic3r/libslic3r.h>
+@@ -23,7 +23,7 @@ template<bool> struct _ccr {};
  template<> struct _ccr<true>
  {
      using SpinningMutex = tbb::spin_mutex;
diff --git a/prusaslicer/patches/patch-src_libslic3r_pchheader.hpp b/prusaslicer/patches/patch-src_libslic3r_pchheader.hpp
index 55c993a360..33e9896777 100644
--- a/prusaslicer/patches/patch-src_libslic3r_pchheader.hpp
+++ b/prusaslicer/patches/patch-src_libslic3r_pchheader.hpp
@@ -4,7 +4,15 @@ Remove use of deprecated tbb::atomic, tbb::mutex, tbb::task_scheduler_init.
 
 --- src/libslic3r/pchheader.hpp.orig	2021-07-16 10:14:03.000000000 +0000
 +++ src/libslic3r/pchheader.hpp
-@@ -93,12 +93,9 @@
+@@ -35,6 +35,7 @@
+ #include <locale>
+ #include <map>
+ #include <memory>
++#include <mutex>
+ #include <numeric>
+ #include <ostream>
+ #include <queue>
+@@ -93,12 +94,9 @@
  #include <boost/thread.hpp>
  #include <boost/version.hpp>
  
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp b/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
index b8f95c7b67..b8f724fc6d 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
@@ -5,7 +5,7 @@ Migrate from deprecated tbb::mutex to std::mutex.
 
 --- src/slic3r/GUI/Mouse3DController.hpp.orig	2021-07-16 10:14:03.000000000 +0000
 +++ src/slic3r/GUI/Mouse3DController.hpp
-@@ -6,7 +6,7 @@
+@@ -6,17 +6,16 @@
  
  #include "libslic3r/Point.hpp"
  
@@ -14,7 +14,9 @@ Migrate from deprecated tbb::mutex to std::mutex.
  
  #include <queue>
  #include <atomic>
-@@ -15,8 +15,6 @@
++#include <mutex>
+ #include <thread>
+ #include <vector>
  #include <chrono>
  #include <condition_variable>
  
@@ -23,7 +25,7 @@ Migrate from deprecated tbb::mutex to std::mutex.
  namespace Slic3r {
  
  class AppConfig;
-@@ -85,7 +83,7 @@ class Mouse3DController
+@@ -85,7 +84,7 @@ class Mouse3DController
      	// m_input_queue is accessed by the background thread and by the UI thread. Access to m_input_queue
      	// is guarded with m_input_queue_mutex.
          std::deque<QueueItem> m_input_queue;
@@ -32,7 +34,7 @@ Migrate from deprecated tbb::mutex to std::mutex.
  
  #ifdef WIN32
          // When the 3Dconnexion driver is running the system gets, by default, mouse wheel events when rotations around the X axis are detected.
-@@ -112,12 +110,12 @@ class Mouse3DController
+@@ -112,12 +111,12 @@ class Mouse3DController
  
  #if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT
          Vec3d               get_first_vector_of_type(unsigned int type) const {
@@ -47,7 +49,7 @@ Migrate from deprecated tbb::mutex to std::mutex.
          	return m_input_queue.size(); 
          }
          std::atomic<size_t> input_queue_max_size_achieved;
-@@ -133,7 +131,7 @@ class Mouse3DController
+@@ -133,7 +132,7 @@ class Mouse3DController
      // UI thread will read / write this copy.
      Params 				m_params_ui;
      bool 	            m_params_ui_changed { false };
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.hpp b/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.hpp
index 01ab6e6947..20528804bf 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.hpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_RemovableDriveManager.hpp
@@ -4,7 +4,12 @@ Migrate from deprecated tbb::mutex to std::mutex.
 
 --- src/slic3r/GUI/RemovableDriveManager.hpp.orig	2021-07-16 10:14:03.000000000 +0000
 +++ src/slic3r/GUI/RemovableDriveManager.hpp
-@@ -5,7 +5,6 @@
+@@ -1,11 +1,11 @@
+ #ifndef slic3r_GUI_RemovableDriveManager_hpp_
+ #define slic3r_GUI_RemovableDriveManager_hpp_
+ 
++#include <mutex>
+ #include <vector>
  #include <string>
  
  #include <boost/thread.hpp>
@@ -12,7 +17,7 @@ Migrate from deprecated tbb::mutex to std::mutex.
  #include <condition_variable>
  
  // Custom wxWidget events
-@@ -111,9 +110,9 @@ private:
+@@ -111,9 +111,9 @@ private:
  	// m_current_drives is guarded by m_drives_mutex
  	// sorted ascending by path
  	std::vector<DriveData> 	m_current_drives;