From 7339ddc0b3efd7e9370e4e57f1f3fa622a612e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 25 Jan 2021 12:49:51 +0100 Subject: [PATCH] Include for std::atomic where needed Fixes build with Boost 1.75 --- atomic.patch | 25 +++++++++++++++++++++++++ prusa-slicer.spec | 5 +++++ 2 files changed, 30 insertions(+) create mode 100644 atomic.patch diff --git a/atomic.patch b/atomic.patch new file mode 100644 index 0000000..734aca8 --- /dev/null +++ b/atomic.patch @@ -0,0 +1,25 @@ +From 19d28524e76ff9c5b7fa4ff1a8373bfbacad9775 Mon Sep 17 00:00:00 2001 +From: Yuri D'Elia +Date: Sun, 13 Dec 2020 19:41:47 +0100 +Subject: [PATCH] Include for std::atomic where needed + +Fixes build on linux using clang 11 +--- + src/slic3r/GUI/Mouse3DController.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp +index eb1425b..4e0c8e6 100644 +--- a/src/slic3r/GUI/Mouse3DController.hpp ++++ b/src/slic3r/GUI/Mouse3DController.hpp +@@ -8,6 +8,7 @@ + + #include "hidapi.h" + ++#include + #include + #include + #include +-- +2.30.0 + diff --git a/prusa-slicer.spec b/prusa-slicer.spec index e9fb563..2eccc3d 100644 --- a/prusa-slicer.spec +++ b/prusa-slicer.spec @@ -31,6 +31,11 @@ Source2: %name.appdata.xml # https://github.com/prusa3d/PrusaSlicer/pull/4340 Patch1: endian.patch +# Include for std::atomic where needed +# Fixes build with Boost 1.75 +# https://github.com/prusa3d/PrusaSlicer/commit/44f71f0ed1 +Patch2: atomic.patch + # Highly-parallel uild can run out of memory on PPC64le %ifarch ppc64le %global _smp_ncpus_max 8