From 16e532f73eeb448241f6d9ca804c547e621a5ca8 Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Thu, 28 Nov 2024 06:32:54 -0800
Subject: [PATCH] libslic3r: include tbb/spin_mutex to fix compilation error
 (#7505)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PrintObject.cpp references tbb::spin_mutex, thus it needs to include
tbb/spin_mutex. Otherwise compilation fails with:

error: ‘spin_mutex’ is not a member of ‘tbb’

Supersedes #7057
---
 flatpak/io.github.softfever.OrcaSlicer.yml      |  2 --
 flatpak/patches/libslic3r_missing_include.patch | 12 ------------
 src/libslic3r/PrintObject.cpp                   |  1 +
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 flatpak/patches/libslic3r_missing_include.patch

diff --git a/flatpak/io.github.softfever.OrcaSlicer.yml b/flatpak/io.github.softfever.OrcaSlicer.yml
index 308801276..0eb8b86c1 100755
--- a/flatpak/io.github.softfever.OrcaSlicer.yml
+++ b/flatpak/io.github.softfever.OrcaSlicer.yml
@@ -304,8 +304,6 @@ modules:
       # OrcaSlicer Source Archive
       - type: dir 
         path: ../
-      - type: patch
-        path: patches/libslic3r_missing_include.patch 
 
       # AppData metainfo for Gnome Software & Co.
       - type: file
diff --git a/flatpak/patches/libslic3r_missing_include.patch b/flatpak/patches/libslic3r_missing_include.patch
deleted file mode 100644
index 3c48e5153..000000000
--- a/flatpak/patches/libslic3r_missing_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
-index 528a72e70..1530fe655 100644
---- a/src/libslic3r/PrintObject.cpp
-+++ b/src/libslic3r/PrintObject.cpp
-@@ -31,6 +31,7 @@
- #include <boost/log/trivial.hpp>
- 
- #include <tbb/parallel_for.h>
-+#include <tbb/spin_mutex.h>
- 
- #include <Shiny/Shiny.h>
- 
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 528a72e70..1530fe655 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -31,6 +31,7 @@
 #include <boost/log/trivial.hpp>
 
 #include <tbb/parallel_for.h>
+#include <tbb/spin_mutex.h>
 
 #include <Shiny/Shiny.h>