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

[Yahor Berdnikau]

commit:     fa6a68eb2d8a4ac721519067a145b84fa0827e3a
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Sun May 29 20:36:11 2022 +0000
Commit:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
CommitDate: Sun May 29 20:36:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa6a68eb

media-gfx/superslicer: drop 2.3.57.9-r1

Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 media-gfx/superslicer/Manifest                     |   2 -
 .../files/missing-imports-2.3.57.9.patch           |  10 --
 .../files/string-to-char-conversion-2.3.56.9.patch |  10 --
 .../files/version-suffix-2.3.57.9.patch            |  38 -------
 .../superslicer/superslicer-2.3.57.9-r1.ebuild     | 109 ---------------------
 5 files changed, 169 deletions(-)

diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 974642d1f..ea9073fee 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -5,5 +5,3 @@ DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2
 DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d
 DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
 DIST superslicer-2.3.57.12.tar.gz 32472874 BLAKE2B 600ed29724476f2812c7bbea9bc26d1b54f2291d8994b883ad9da64899ad181ca19e3975865f190b1a3125341456fb38f982f5c20a5d4a0c36459de498a6588b SHA512 3830d275ef9dc5a4b1c62451e532012995647ba276a65007ae2160a89f2c044e18bad851dcf225f768a7023d00e92f398013ffdf1e1fd75e137f37e93edc8f59
-DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
-DIST superslicer-2.3.57.9.tar.gz 32406027 BLAKE2B 66c6c5cfb044165dd8cce3030fc9e6c29df078aaca94dfecef4c5943a21667fc9dd12d88e821952382e7556775119daf221030b2bb25fc1e52071c4f367fe041 SHA512 bf421afa55ad7d1c3eafa8dc15efb20ab463e21b78f5e03d188f68d018a7b32cd24c2163974d90eff80e1ebb39a669b3e877a614e1040bc31c7160cca7ffc554

diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.9.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.9.patch
deleted file mode 100644
index ebc7ac3dc..000000000
--- a/media-gfx/superslicer/files/missing-imports-2.3.57.9.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libslic3r/PrintObject.cpp
-+++ b/src/libslic3r/PrintObject.cpp
-@@ -15,6 +15,7 @@
- #include "Format/STL.hpp"
-
- #include <atomic>
-+#include <chrono>
- #include <utility>
- #include <boost/log/trivial.hpp>
- #include <float.h>

diff --git a/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch b/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch
deleted file mode 100644
index 6cb596bf0..000000000
--- a/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -837,7 +837,7 @@ bool GUI_App::on_init_inner()
-         }
-         wxString artist;
-         if (!file_name.empty() && file_name != (std::string(SLIC3R_APP_NAME) + L(" icon"))) {
--            wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).string());
-+            wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).c_str());
-         // make a bitmap with dark grey banner on the left side
-             bmp = SplashScreen::MakeBitmap(wxBitmap(splash_screen_path, wxBITMAP_TYPE_JPEG));

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.9.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.9.patch
deleted file mode 100644
index bd41db684..000000000
--- a/media-gfx/superslicer/files/version-suffix-2.3.57.9.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/version.inc
-+++ b/version.inc
-@@ -4,9 +4,9 @@
- # 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.9")
---- 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@

diff --git a/media-gfx/superslicer/superslicer-2.3.57.9-r1.ebuild b/media-gfx/superslicer/superslicer-2.3.57.9-r1.ebuild
deleted file mode 100644
index c16a1f5c7..000000000
--- a/media-gfx/superslicer/superslicer-2.3.57.9-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/118aa919c16837eb2ff6ba97e2934fa4144ef806.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}/string-to-char-conversion-2.3.56.9.patch"
-	"${FILESDIR}/version-suffix-${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-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${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
-		dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
-	fi
-}