media-gfx/prusaslicer: fixed building with boost 1.85

Closes: https://bugs.gentoo.org/932291
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

7 files changed, 32 insertions, 12 deletions

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch
index 0e3d1d340572..d7c5f25a1651 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch
@@ -1,5 +1,3 @@
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index e855b6290..2479bf054 100644
 --- a/src/slic3r/GUI/GUI_App.cpp
 +++ b/src/slic3r/GUI/GUI_App.cpp
 @@ -1128,6 +1128,9 @@ bool GUI_App::OnInit()
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
index b949d3b5a897..1d36fcbb7b57 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
@@ -1,5 +1,3 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 50eccfc84..d0f9205b3 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -115,9 +115,6 @@ if (SLIC3R_GUI)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch
index 23006a2ceedf..4a93da994bd7 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch
@@ -3,12 +3,6 @@ From: Malte kleine Piening <mkl.piening@gmail.com>
 Date: Tue, 18 Apr 2023 22:29:04 +0200
 Subject: [PATCH] fixed double definition of target libexpat described in #9581
 
----
- cmake/modules/FindEXPAT.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindEXPAT.cmake b/cmake/modules/FindEXPAT.cmake
-index de204c60f7e..5863e136ec5 100644
 --- a/cmake/modules/FindEXPAT.cmake
 +++ b/cmake/modules/FindEXPAT.cmake
 @@ -25,7 +25,7 @@ if (NOT EXPAT_FOUND)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
index 3c97ead5c6b2..296c0366e34a 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
@@ -1,5 +1,3 @@
-diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
-index d8dd8e1..d27055f 100644
 --- a/src/occt_wrapper/CMakeLists.txt
 +++ b/src/occt_wrapper/CMakeLists.txt
 @@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch
new file mode 100644
index 000000000000..4ccaff8f6b17
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch
@@ -0,0 +1,30 @@
+--- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Snapshot.cpp
++++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Snapshot.cpp
+@@ -12,6 +12,7 @@
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/property_tree/ptree_fwd.hpp>
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/log/trivial.hpp>
+ 
+ #include "libslic3r/PresetBundle.hpp"
+--- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Version.cpp
++++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Version.cpp
+@@ -7,6 +7,7 @@
+ #include <cctype>
+ 
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/nowide/fstream.hpp>
+ 
+ #include "libslic3r/libslic3r.h"
+--- PrusaSlicer-version_2.7.4.old/src/slic3r/GUI/RemovableDriveManager.cpp
++++ PrusaSlicer-version_2.7.4/src/slic3r/GUI/RemovableDriveManager.cpp
+@@ -35,7 +35,6 @@
+ #include <pwd.h>
+ #include <boost/filesystem.hpp>
+ #include <boost/system/error_code.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ #include <boost/process.hpp>
+ #endif
+ 
diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
index 2bc5d574fed6..3745d41a4e8d 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
 	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+	"${FILESDIR}/${PN}-2.7.4-boost-1.85.patch"
 )
 
 src_prepare() {
diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
index 5f7e18907896..72b48171933c 100644
--- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
 	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+	"${FILESDIR}/${PN}-2.7.4-boost-1.85.patch"
 )
 
 src_prepare() {