[gentoo-commits] repo/proj/guru:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/

["Florian Schmaus" <flow@gentoo.org>]

commit:     5f20c0efa01153b76ed2f28dc3cf10e1a1a1a818
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Fri Feb 18 18:34:07 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 19:35:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f20c0ef

media-gfx/superslicer: add version 2.3.57.11

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 media-gfx/superslicer/Manifest                     |   2 +
 .../files/missing-imports-2.3.57.11.patch          |  10 ++
 .../superslicer/files/symlink-fix-2.3.57.11.patch  |   9 ++
 .../files/version-suffix-2.3.57.11.patch           |  42 ++++++++
 media-gfx/superslicer/superslicer-2.3.57.11.ebuild | 108 +++++++++++++++++++++
 5 files changed, 171 insertions(+)

diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index ae10bbf82..0a6304018 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,6 +1,8 @@
 DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
 DIST superslicer-2.3.57.10-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
 DIST superslicer-2.3.57.10.tar.gz 32466957 BLAKE2B 7c5fff6ba8139a9bf66d931e6e48e6a9201e7911e90ce2e822ded7ae713f0b8fdf86b9cd317ded4802146c24758148ec989c213b5992c323a2fd442e17a4e228 SHA512 4d20078e11f5f99993220409bee54ca0a3f2a6fff04febfc09b5f1bc445ceaabc3a359f8f7f478127aa1504e8ba8a121a682c991adf2c45cb2ff1598ed2e3445
+DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
+DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d
 DIST superslicer-2.3.57.7-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
 DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65
 DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa

diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.11.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.11.patch
new file mode 100644
index 000000000..009a4892a
--- /dev/null
+++ b/media-gfx/superslicer/files/missing-imports-2.3.57.11.patch
@@ -0,0 +1,10 @@
+--- a/src/slic3r/Utils/PresetUpdater.cpp
++++ b/src/slic3r/Utils/PresetUpdater.cpp
+@@ -6,6 +6,7 @@
+ #include <ostream>
+ #include <utility>
+ #include <stdexcept>
++#include <regex>
+
+ #include <boost/algorithm/string.hpp>
+ #include <boost/filesystem.hpp>

diff --git a/media-gfx/superslicer/files/symlink-fix-2.3.57.11.patch b/media-gfx/superslicer/files/symlink-fix-2.3.57.11.patch
new file mode 100644
index 000000000..80d9eddfa
--- /dev/null
+++ b/media-gfx/superslicer/files/symlink-fix-2.3.57.11.patch
@@ -0,0 +1,9 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -273,5 +273,5 @@ else ()
+     install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+
+     # Install the symlink for gcodeviewer
+-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
++    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
+ endif ()

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.11.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.11.patch
new file mode 100644
index 000000000..476509e0a
--- /dev/null
+++ b/media-gfx/superslicer/files/version-suffix-2.3.57.11.patch
@@ -0,0 +1,42 @@
+--- a/src/platform/unix/Gcodeviewer.desktop.in
++++ b/src/platform/unix/Gcodeviewer.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@GCODEVIEWER_APP_NAME@
++Name=@GCODEVIEWER_APP_KEY@
+ Comment=G-code viewer of Slic3r
+ Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
+ Icon=@GCODEVIEWER_APP_KEY@
+--- a/src/platform/unix/Slic3r.desktop.in
++++ b/src/platform/unix/Slic3r.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@SLIC3R_APP_NAME@
++Name=@SLIC3R_APP_KEY@
+ GenericName=3D Printing Software
+ Comment=G-code generator for 3D printers
+ Icon=@SLIC3R_APP_KEY@
+@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
+ Categories=Graphics;3DGraphics;Engineering;
+ Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
+ StartupNotify=false
+-StartupWMClass=@SLIC3R_APP_KEY@
++StartupWMClass=@SLIC3R_APP_NAME@
+--- a/version.inc
++++ b/version.inc
+@@ -4,13 +4,13 @@
+ # name of the slicer
+ set(SLIC3R_APP_NAME "SuperSlicer")
+ # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
+-set(SLIC3R_APP_KEY "SuperSlicer")
++set(SLIC3R_APP_KEY "SuperSlicer2.3")
+ # exe name of the slicer, should be lowercase and valid in all os
+-set(SLIC3R_APP_CMD "superslicer")
++set(SLIC3R_APP_CMD "superslicer-2.3")
+ # versions
+ set(SLIC3R_VERSION "2.3.57")
+ set(SLIC3R_VERSION_FULL "2.3.57.11")
+-set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN")
++set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+Gentoo")
+ set(SLIC3R_RC_VERSION "2,3,57,11")
+ set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}")

diff --git a/media-gfx/superslicer/superslicer-2.3.57.11.ebuild b/media-gfx/superslicer/superslicer-2.3.57.11.ebuild
new file mode 100644
index 000000000..a0230fbb7
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.3.57.11.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="SuperSlicer"
+DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer"
+SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
+	profiles? ( https://github.com/slic3r/slic3r-profiles/archive/0b8261ae8bbd7c31d736f371323476d6aff3ef3b.zip -> ${P}-profiles.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="AGPL-3"
+SLOT="23"
+KEYWORDS="~amd64"
+IUSE="gui test profiles"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="profiles? ( app-arch/unzip )"
+RDEPEND="
+		dev-cpp/eigen:3
+		dev-cpp/tbb
+		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+		dev-libs/cereal
+		dev-libs/expat
+		dev-libs/c-blosc
+		dev-libs/gmp:=
+		>=dev-libs/miniz-2.1.0-r2
+		dev-libs/mpfr:=
+		>=media-gfx/openvdb-5.0.0
+		media-libs/ilmbase:=
+		media-libs/libpng:0=
+		media-libs/openexr:0=
+		media-libs/qhull:=
+		sci-libs/libigl
+		sci-libs/nlopt
+		>=sci-mathematics/cgal-5.0:=
+		sys-apps/dbus
+		sys-libs/zlib:=
+		gui? (
+				dev-libs/glib:2
+				media-libs/glew:0=
+				net-misc/curl
+				virtual/glu
+				virtual/opengl
+				x11-libs/gtk+:3
+				>=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
+		)
+"
+DEPEND="${RDEPEND}
+		media-libs/qhull[static-libs]
+		test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
+	"${FILESDIR}/freecad-dialog-2.2.53.4.patch"
+	"${FILESDIR}/missing-imports-${PV}.patch"
+	"${FILESDIR}/version-suffix-${PV}.patch"
+	"${FILESDIR}/symlink-fix-${PV}.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
+	cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
+
+	use profiles && unpack ${P}-profiles.zip
+	if use profiles ; then
+		cp -r "${WORKDIR}/slic3r-profiles-0b8261ae8bbd7c31d736f371323476d6aff3ef3b/"* "${S}/resources/profiles" || die "Failed to copy profiles"
+	fi
+}
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	CMAKE_BUILD_TYPE=Release
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
+	fi
+}