gentoo auto-resync : 23:03:2023 - 12:45:13

4 files changed, 94 insertions, 14 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 30ecd434a1b0..ebb4e8ff7bdd 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,8 +1,10 @@
-AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3836 BLAKE2B 92bd4d4e43eceb67a1356552ee75431d05d61f5983986d109f6601b3fb86b195a39d18f26add58426fa535200af778864ff643a38d6771cb5e7de6a3a91f0192 SHA512 3a13e2e0fb0fd53571ea2b44403c810729b80c715a8fcaa5c596f680eb9c67e9f86c2194e09af4de54baa5bd95023b32f27cb475ccfe9ac71ea583b5ab02aba5
-AUX prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch 2581 BLAKE2B 8c2ec83db05e97949aa9fb43d3980748be1324cb2ac90c8caec45b772fb2bad34f56365381bb371d0094079b42065a65c00595388ec861e127b846e6859a0281 SHA512 6f454745d8f84dbcded092a1a16b2903757b36d76888a4c40e1f019f75ba6bea9b245c980347cc7feb0a9bdd22e8eb4e4b12e639594f1fe6e928eea5298081ec
+AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3297 BLAKE2B 2353b6c84d0c9bba6c0858517ce5ca374c61d5727b585828c0ebb1dc24c6746b58539d7ca7e13863e269e6969edb7fc127e310c30607d0a2e19dc23a1ed89dc0 SHA512 1493e0547b0068b60af0a1bc376caa04a8fa2f482665b009386ca94013718a4f08088bd68514a146d9f67155d5b5a7a79a23d4374f127d19085fd02488ceeac8
+AUX prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch 2509 BLAKE2B 6acf83743780b847fe3334213c227f33ec992e4fff8a873f42dcf26be8d008212928d01034b3fd9daf3873e0ef94943947d8adeadc4c426918f97493a008c0a1 SHA512 fef42120814bf5c45dd5bcd7dbad477cdd74ec62bea85335a67973072ae5e16e91e08530815a4bbb649c9ac418510e18b2cd4c136abcd1eacb0c2ca7a943871c
 AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1384 BLAKE2B 080b05c64f181759616557ebe6d83f91dd9a7b45f0f3833f9c3fa7f3d74df3d3399b353898967a51597b0422a611e8a86f85a8825de1a8fe818b389384e70373 SHA512 c325f7fed4bcdb380221c3b63ad525a53d26bab8baf7c7347035c8d22474ab38af944e445fc58da7f7979d9ec53f61b17a9edc1e7d86c65ac796e479a0316ce6
 AUX prusaslicer-2.5.0_rc1-fix-tests.patch 363 BLAKE2B 49c2dd3da996148497ab09854421cadd5054d06d5d78c2fd973f274857817c4fa0da7dfdb5efed03125422c2cab432d0f946f0f84929e08756ca3180bebd6709 SHA512 952958b687bf1b0d454ed921799d283b08fe56acaccbd909c41269243839cd5c02b1aca594d1fa947aff73c853ef6dcfd52e938f4f39a54396ec32d2e9cb284b
 DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431 SHA512 b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
+DIST prusaslicer-2.5.1.tar.gz 48888707 BLAKE2B 2d976cdb7a72e14fba3bdef044b317dca059549b300ea327fe396ace121441260f6bc29dfcd4e7e8d0624ea90d3014cdea1af8a970abac4b1c0c91fa291d0b3c SHA512 7326f5e2ce5316b9afd9387f616a489d2f0e5d256ff27efbd91baa5a1755f8ccdb6ec14139f0074ead330d11674c20bb2d22b77f866ac26e5ec170223ced4af6
 EBUILD prusaslicer-2.5.0-r1.ebuild 2003 BLAKE2B c865dbecdfbeeb17aedd89266db7edc044c4a2c3b436bc294f766775f3dcfb00c685ee0ba9f0c5a0957cfeb04bdba07126dbf0c8fa0e528b7702b9a17e27a56c SHA512 3e6b41cf9b37fc61d96a55f0d1176d2cd8948429f2eb1c263eac318dc27abfdca91a2878ce102efccf744e51311f6fafc6d52b3cd4df8f48f0378ea684c1931b
 EBUILD prusaslicer-2.5.0-r2.ebuild 2006 BLAKE2B 976d13d1bc0d421e25ddfe0efab831d696cb80aa4a09e55e0ba93d75f725b6a68353a3a1b38a6d695518c5cd3284e57b19be388780bb508551711aca759ecc50 SHA512 0c7ca19005f272dc89e2a29c5a147984b9b9857fbbab2ee19b1442aef06ec7e1095a15fa041c42fe7e14a35458fca21293e9f2e8f0defdc8cd465087963fcddd
+EBUILD prusaslicer-2.5.1.ebuild 1986 BLAKE2B 6611a8156b70bc9d6acbb97dfe2f5b8299d21fdc130f704211015e3c7efd739dd4e6b89bf3cef0097af928a3c51d18c25ac652158a70138caf79f97d7fef703f SHA512 b07f14888a2acceb6240723d1800c45fad1aeda09e9721814648537c27449ce7788da07453d2d0c724d80d92116b7db27e0ba82b074f2e2f037b078522318f55
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
index 749f3c06289a..9418707c1065 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
@@ -1,5 +1,3 @@
-diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
-index 7c8029c..d75f8c5 100644
 --- a/src/hints/HintsToPot.cpp
 +++ b/src/hints/HintsToPot.cpp
 @@ -1,6 +1,7 @@
@@ -19,8 +17,6 @@ index 7c8029c..d75f8c5 100644
  	for (const auto& element : data)
  	{
  		//Example of .pot element 
-diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
-index 4664cff..41dd374 100644
 --- a/src/libslic3r/Preset.cpp
 +++ b/src/libslic3r/Preset.cpp
 @@ -25,6 +25,7 @@
@@ -40,8 +36,6 @@ index 4664cff..41dd374 100644
      boost::property_tree::read_ini(ifs, tree);
      return VendorProfile::from_ini(tree, path, load_all);
  }
-diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-index 81c681b..7f99a50 100644
 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
 +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
 @@ -10,6 +10,7 @@
@@ -59,8 +53,6 @@ index 81c681b..7f99a50 100644
 -#endif // __linux__
 \ No newline at end of file
 +#endif // __linux__
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 5bc770b..d566e91 100644
 --- a/src/slic3r/GUI/GUI_App.cpp
 +++ b/src/slic3r/GUI/GUI_App.cpp
 @@ -13,6 +13,7 @@
@@ -71,8 +63,6 @@ index 5bc770b..d566e91 100644
  #include <boost/algorithm/string/predicate.hpp>
  #include <boost/algorithm/string.hpp>
  #include <boost/format.hpp>
-diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
-index 14ebbc6..2de896c 100644
 --- a/src/slic3r/GUI/HintNotification.cpp
 +++ b/src/slic3r/GUI/HintNotification.cpp
 @@ -15,6 +15,7 @@
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
index 1cb0d9f1afff..becab0a88355 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
@@ -1,5 +1,5 @@
---- a/src/slic3r/GUI/PrintHostDialogs.cpp	2022-12-21 10:21:43.583075853 +1100
-+++ b/src/slic3r/GUI/PrintHostDialogs.cpp	2022-12-21 10:23:03.902694287 +1100
+--- a/src/slic3r/GUI/PrintHostDialogs.cpp
++++ b/src/slic3r/GUI/PrintHostDialogs.cpp
 @@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
      if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos)
          m_valid_suffix = recent_path.substr(extension_start);
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild
new file mode 100644
index 000000000000..09476833706a
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+MY_PN="PrusaSlicer"
+MY_PV="$(ver_rs 3 -)"
+
+inherit cmake wxwidgets xdg
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
+SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb:=
+	dev-libs/boost:=[nls]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	media-gfx/openvdb:=
+	net-misc/curl[adns]
+	media-libs/glew:0=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	sci-libs/nlopt
+	sci-libs/opencascade:=
+	sci-mathematics/cgal:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
+	"${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
+	"${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+
+src_prepare() {
+	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
+
+	sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
+		src/occt_wrapper/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=ON
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}