gentoo auto-resync : 23:06:2024 - 00:11:30

4 files changed, 63 insertions, 2 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 14fadec75dc3..99120bd0c17e 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -2,7 +2,9 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a9
 AUX prusaslicer-2.6.0-libexpat-double-definition-fix.patch 636 BLAKE2B 047ea78be4b645790150c597e73df834cd77013f3f84f5823567318867c21746521f81582ad21e7c2db4d27e8e4e31b357a6160448ad306b5ee18a2a4efe90fe SHA512 e8bcd9db4d4cb895cebf7dd08e8f8428de7a845d802a1cd9cd6ca806450f5320dafe363bc5737203421ebe20f99110462e3ce4a16ee7c7d11be8222009be8dd4
 AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0
 AUX prusaslicer-2.7.4-boost-1.85.patch 1060 BLAKE2B ea7970e19573f686a181b6e824ba1cccbdbefc339ed557e072169a5bff71b550ec61fa25f95d8cf0db91ce34ea3a4060c19f6c9621e1367564bd2bd04d90e815 SHA512 2e04a61ad5cd152ec26699bce5d81ceb9c59d2daca64a827902e99c536e8060461fbe442c79fb843025ca31e52f2db119dd4c03225c8dd46186001d9db888592
+AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206
+AUX prusaslicer-2.8.0-missing-includes.patch 958 BLAKE2B 52f05278ab7620fca7ab427facdb60f0eb5c625e67165d66c010b40adb0dd5b0c66e1be9a70cf88f6732c06434126936e0a1da11b293544bef65d6a2fc7ab349 SHA512 04ac49c2b3265d009c4537b28cdf45b28990b0f92c96e1cf5f636cbe56b7a76f60cc4dc9976bd576de6ad5dce62102a6d42283d0c6726021924d714ca0e47da2
 DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69 SHA512 fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b
 EBUILD prusaslicer-2.7.4.ebuild 2243 BLAKE2B f43117ea21eea84e3d853d5fed92c3f29386eaf988b06152726888fae7588e54c67e14536a1039829a64d2ba6f1c73cdac011817b1268a848f6d1d943de19dce SHA512 9b9c9075f49b852857801a8da5227e005281fb866af795af9a2e98a86c66fba3ee946d1b684c334b3967d72ced8cf5a5e17365d07ca49d949ee7b0e3cece67e0
-EBUILD prusaslicer-9999.ebuild 2173 BLAKE2B ee1ff710336b5380066ce129ff30a12bf659bf63a476e665cb69c81c4e60dad5324366eeb2fe5d66eae84247a1fe1f72559ba029da0d3e225817df4182de0658 SHA512 7cc78f61efcc7357568d9e6c6005cda9a5afc32a4351db5c0eb585c8d8c8df907f9c4527a2fa3512e0677d67ef79b5f498427a6467962a66679d9b1800b1ce41
+EBUILD prusaslicer-9999.ebuild 2290 BLAKE2B 3d8ab134fa6ccf8067cfce6820bd3c93e4771d805549ce0521e51419a202820126e624219ba1b7d6b87c1b4a695157db9b3e819c34a3e4807dd20353f444d4eb SHA512 72d681527480aa256757db2c61e00a0cac7f20019d4ed1dea4b496910ab15576946f9f3a8509767ae2810de394e890655117ced6d02c7f71a22104eae4983e1a
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
new file mode 100644
index 000000000000..33ab6256d6b0
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
@@ -0,0 +1,19 @@
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES
+ )
+ 
+ find_package(NanoSVG REQUIRED)
++find_package(OpenSSL REQUIRED)
+ 
+ if (APPLE)
+     list(APPEND SLIC3R_GUI_SOURCES
+@@ -404,7 +405,7 @@ endforeach()
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto)
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
new file mode 100644
index 000000000000..f92813b6b335
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -0,0 +1,35 @@
+--- a/src/slic3r/Config/Version.cpp
++++ b/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"
+--- a/src/slic3r/GUI/RulerForDoubleSlider.cpp
++++ b/src/slic3r/GUI/RulerForDoubleSlider.cpp
+@@ -4,6 +4,12 @@
+ ///|/
+ #include "RulerForDoubleSlider.hpp"
+ #include "libslic3r/CustomGCode.hpp"
++#include "../../libslic3r/libslic3r.h"
++
++#include <algorithm>
++#include <cmath>
++#include <numeric>
++#include <iterator>
+ 
+ using namespace Slic3r;
+ using namespace CustomGCode;
+--- a/src/slic3r/GUI/UserAccountCommunication.cpp
++++ b/src/slic3r/GUI/UserAccountCommunication.cpp
+@@ -9,6 +9,7 @@
+ #include <boost/log/trivial.hpp>
+ #include <boost/beast/core/detail/base64.hpp>
+ #include <boost/algorithm/string.hpp>
++#include <boost/nowide/convert.hpp>
+ #include <curl/curl.h>
+ #include <string>
+ 
diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
index 124181307e1c..71ea154eda73 100644
--- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/opengl
 	x11-libs/gtk+:3
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
 	media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}
@@ -59,6 +59,11 @@ DEPEND="${RDEPEND}
 	test? ( =dev-cpp/catch-2* )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+	"${FILESDIR}/${PN}-2.8.0-fixed-linking.patch"
+)
+
 src_prepare() {
 	if has_version ">=sci-libs/opencascade-7.8.0"; then
 		eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"