From 658c2b8f3b6cac4d58d032891e57838a1e097466065d03b1e41c361241ed496e Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 26 Apr 2024 12:00:28 +0000 Subject: [PATCH] Accepting request 1170275 from home:bnavigator:branches:science - Don't include stray filesystem/convenience.hpp removed in boost 1.85 OBS-URL: https://build.opensuse.org/request/show/1170275 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=76 --- PrusaSlicer.changes | 6 ++++++ PrusaSlicer.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index f74acf4..1a335aa 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 26 07:16:48 UTC 2024 - Ben Greiner + +- Don't include stray filesystem/convenience.hpp removed in + boost 1.85 + ------------------------------------------------------------------- Thu Apr 25 13:54:10 UTC 2024 - Ben Greiner diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index 96048c7..ce484d9 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -105,6 +105,8 @@ sed -i "s|find_package(Qhull 7.2 REQUIRED)|find_package(Qhull 8.0.2 REQUIRED)|" sed -i 's#INTERFACE Qhull::qhullcpp#INTERFACE -lqhullcpp#' src/CMakeLists.txt # Disable slic3r_jobs_tests.cpp as the test fails sometimes sed -i 's|slic3r_jobs_tests.cpp||' tests/slic3rutils/CMakeLists.txt +# gh#prusa3d/PrusaSlicer#12652 +sed -i /convenience.hpp/d src/slic3r/GUI/RemovableDriveManager.cpp %build # The build process really acquires that much memory per job. We are