media-gfx/prusaslicer: fixes and improvements

improved handling of eigen3
(thanks to jmickelin: https://github.com/prusa3d/PrusaSlicer/issues/13608)
fixed libsoup double linking
(thanks to Alexander Golubev <fatzer2@gmail.com>)

Closes: https://github.com/gentoo/gentoo/pull/39379
Closes: https://bugs.gentoo.org/940182
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

4 files changed, 19 insertions, 29 deletions

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch
new file mode 100644
index 000000000000..dbb0aa36727a
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch
@@ -0,0 +1,11 @@
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -465,7 +465,7 @@ if (UNIX AND NOT APPLE)
+     find_package(GTK${SLIC3R_GTK} REQUIRED)
+     find_package(PkgConfig REQUIRED)
+ 
+-    pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.0 webkit2gtk-4.1)
++    pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.1)
+     target_link_libraries(libslic3r_gui PUBLIC ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig PkgConfig::WEBKIT2GTK)
+ endif ()
+ 
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
index b7fc95554591..9d387a07993d 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
@@ -1,28 +1,3 @@
---- a/bundled_deps/admesh/CMakeLists.txt
-+++ b/bundled_deps/admesh/CMakeLists.txt
-@@ -13,4 +13,3 @@ add_library(admesh STATIC
- 
- target_include_directories(admesh PUBLIC .)
- target_link_libraries(admesh PRIVATE boost_headeronly localesutils)
--target_link_libraries(admesh PUBLIC Eigen3::Eigen)
---- a/src/clipper/CMakeLists.txt
-+++ b/src/clipper/CMakeLists.txt
-@@ -10,5 +10,4 @@ add_library(clipper STATIC
- )
- 
- target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128)
--target_link_libraries(clipper PUBLIC Eigen3::Eigen)
- target_include_directories(clipper PUBLIC .)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -629,7 +629,6 @@ target_link_libraries(libslic3r PRIVATE
-     int128
- )
- target_link_libraries(libslic3r PUBLIC
--    Eigen3::Eigen
-     semver
-     admesh
-     localesutils
 --- a/src/slic3r/CMakeLists.txt
 +++ b/src/slic3r/CMakeLists.txt
 @@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES
diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild
index ee32a6be8059..6b3be9ea12e5 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	media-libs/qhull:=
+	net-libs/webkit-gtk:4.1
 	sci-libs/libigl
 	sci-libs/nlopt
 	sci-libs/opencascade:=
@@ -66,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
 	"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
 	"${FILESDIR}/${PN}-2.8.1-fstream.patch"
+	"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
 )
 
 src_prepare() {
@@ -78,8 +80,8 @@ src_prepare() {
 	sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
 		src/occt_wrapper/CMakeLists.txt || die
 
-	find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \
-		sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die
+	# remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608
+	rm cmake/modules/FindEigen3.cmake || die
 
 	cmake_src_prepare
 }
diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
index fbf13e9d7d66..66c1089c97e8 100644
--- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	media-libs/qhull:=
+	net-libs/webkit-gtk:4.1
 	sci-libs/libigl
 	sci-libs/nlopt
 	sci-libs/opencascade:=
@@ -66,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
 	"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
 	"${FILESDIR}/${PN}-2.8.1-fstream.patch"
+	"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
 )
 
 src_prepare() {
@@ -78,8 +80,8 @@ src_prepare() {
 	sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
 		src/occt_wrapper/CMakeLists.txt || die
 
-	find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \
-		sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die
+	# remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608
+	rm cmake/modules/FindEigen3.cmake || die
 
 	cmake_src_prepare
 }