commit: 117d89049960722e3ff11df0f69c60722dd367b6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 06:47:14 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 06:48:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117d8904
media-gfx/prusaslicer: bump to 2.5.1
dropped obsolete versions from deps + scrubbed patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-gfx/prusaslicer/Manifest | 1 +
.../prusaslicer-2.5.0_alpha2-boost-fixes.patch | 10 ---
....0_boost-1.81-std-wxString-to-std-wstring.patch | 4 +-
media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild | 88 ++++++++++++++++++++++
4 files changed, 91 insertions(+), 12 deletions(-)
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 6b14dcd25eb3..4a975acb001b 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B
e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431
SHA512
b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
+DIST prusaslicer-2.5.1.tar.gz 48888707 BLAKE2B
2d976cdb7a72e14fba3bdef044b317dca059549b300ea327fe396ace121441260f6bc29dfcd4e7e8d0624ea90d3014cdea1af8a970abac4b1c0c91fa291d0b3c
SHA512
7326f5e2ce5316b9afd9387f616a489d2f0e5d256ff27efbd91baa5a1755f8ccdb6ec14139f0074ead330d11674c20bb2d22b77f866ac26e5ec170223ced4af6
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
+}
