Gentoo Archives: gentoo-commits

From: Yahor Berdnikau <egorr.berd@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
Date: Sun, 29 May 2022 20:39:07
Message-Id: 1653856646.5b22aaf01ab109a5e0dd1fd7d86a58f261d39b00.egorr.berd@gentoo
1 commit: 5b22aaf01ab109a5e0dd1fd7d86a58f261d39b00
2 Author: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
3 AuthorDate: Sun May 29 20:37:26 2022 +0000
4 Commit: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
5 CommitDate: Sun May 29 20:37:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b22aaf0
7
8 media-gfx/superslicer: drop 2.3.57.10
9
10 Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>
11
12 media-gfx/superslicer/Manifest | 2 -
13 .../files/missing-imports-2.3.57.10.patch | 10 --
14 .../files/version-suffix-2.3.57.10.patch | 38 --------
15 media-gfx/superslicer/superslicer-2.3.57.10.ebuild | 108 ---------------------
16 4 files changed, 158 deletions(-)
17
18 diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
19 index ea9073fee..d607392fb 100644
20 --- a/media-gfx/superslicer/Manifest
21 +++ b/media-gfx/superslicer/Manifest
22 @@ -1,6 +1,4 @@
23 DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
24 -DIST superslicer-2.3.57.10-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
25 -DIST superslicer-2.3.57.10.tar.gz 32466957 BLAKE2B 7c5fff6ba8139a9bf66d931e6e48e6a9201e7911e90ce2e822ded7ae713f0b8fdf86b9cd317ded4802146c24758148ec989c213b5992c323a2fd442e17a4e228 SHA512 4d20078e11f5f99993220409bee54ca0a3f2a6fff04febfc09b5f1bc445ceaabc3a359f8f7f478127aa1504e8ba8a121a682c991adf2c45cb2ff1598ed2e3445
26 DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
27 DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d
28 DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
29
30 diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.10.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.10.patch
31 deleted file mode 100644
32 index 009a4892a..000000000
33 --- a/media-gfx/superslicer/files/missing-imports-2.3.57.10.patch
34 +++ /dev/null
35 @@ -1,10 +0,0 @@
36 ---- a/src/slic3r/Utils/PresetUpdater.cpp
37 -+++ b/src/slic3r/Utils/PresetUpdater.cpp
38 -@@ -6,6 +6,7 @@
39 - #include <ostream>
40 - #include <utility>
41 - #include <stdexcept>
42 -+#include <regex>
43 -
44 - #include <boost/algorithm/string.hpp>
45 - #include <boost/filesystem.hpp>
46
47 diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.10.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.10.patch
48 deleted file mode 100644
49 index ddbda92ac..000000000
50 --- a/media-gfx/superslicer/files/version-suffix-2.3.57.10.patch
51 +++ /dev/null
52 @@ -1,38 +0,0 @@
53 ---- a/version.inc
54 -+++ b/version.inc
55 -@@ -4,9 +4,9 @@
56 - # name of the slicer
57 - set(SLIC3R_APP_NAME "SuperSlicer")
58 - # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
59 --set(SLIC3R_APP_KEY "SuperSlicer")
60 -+set(SLIC3R_APP_KEY "SuperSlicer2.3")
61 - # exe name of the slicer, should be lowercase and valid in all os
62 --set(SLIC3R_APP_CMD "superslicer")
63 -+set(SLIC3R_APP_CMD "superslicer-2.3")
64 - # versions
65 - set(SLIC3R_VERSION "2.3.57")
66 - set(SLIC3R_VERSION_FULL "2.3.57.10")
67 ---- a/src/platform/unix/Slic3r.desktop.in
68 -+++ b/src/platform/unix/Slic3r.desktop.in
69 -@@ -1,5 +1,5 @@
70 - [Desktop Entry]
71 --Name=@SLIC3R_APP_NAME@
72 -+Name=@SLIC3R_APP_KEY@
73 - GenericName=3D Printing Software
74 - Comment=G-code generator for 3D printers
75 - Icon=@SLIC3R_APP_KEY@
76 -@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
77 - Categories=Graphics;3DGraphics;Engineering;
78 - Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
79 - StartupNotify=false
80 --StartupWMClass=@SLIC3R_APP_KEY@
81 -+StartupWMClass=@SLIC3R_APP_NAME@
82 ---- a/src/platform/unix/Gcodeviewer.desktop.in
83 -+++ b/src/platform/unix/Gcodeviewer.desktop.in
84 -@@ -1,5 +1,5 @@
85 - [Desktop Entry]
86 --Name=@GCODEVIEWER_APP_NAME@
87 -+Name=@GCODEVIEWER_APP_KEY@
88 - Comment=G-code viewer of Slic3r
89 - Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
90 - Icon=@GCODEVIEWER_APP_KEY@
91
92 diff --git a/media-gfx/superslicer/superslicer-2.3.57.10.ebuild b/media-gfx/superslicer/superslicer-2.3.57.10.ebuild
93 deleted file mode 100644
94 index f7182ba82..000000000
95 --- a/media-gfx/superslicer/superslicer-2.3.57.10.ebuild
96 +++ /dev/null
97 @@ -1,108 +0,0 @@
98 -# Copyright 2022 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=8
102 -
103 -WX_GTK_VER="3.0-gtk3"
104 -
105 -inherit xdg cmake desktop wxwidgets
106 -
107 -MY_PN="SuperSlicer"
108 -DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
109 -HOMEPAGE="https://github.com/supermerill/SuperSlicer"
110 -SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
111 - profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.zip -> ${P}-profiles.zip )"
112 -S="${WORKDIR}/${MY_PN}-${PV}"
113 -
114 -LICENSE="AGPL-3"
115 -SLOT="23"
116 -KEYWORDS="~amd64"
117 -IUSE="gui test profiles"
118 -
119 -# tests fail to link with USE=-gui, bug #760096
120 -REQUIRED_USE="test? ( gui )"
121 -RESTRICT="!test? ( test )"
122 -
123 -BDEPEND="profiles? ( app-arch/unzip )"
124 -RDEPEND="
125 - dev-cpp/eigen:3
126 - dev-cpp/tbb
127 - >=dev-libs/boost-1.73.0:=[nls,threads(+)]
128 - dev-libs/cereal
129 - dev-libs/expat
130 - dev-libs/c-blosc
131 - dev-libs/gmp:=
132 - >=dev-libs/miniz-2.1.0-r2
133 - dev-libs/mpfr:=
134 - >=media-gfx/openvdb-5.0.0
135 - media-libs/ilmbase:=
136 - media-libs/libpng:0=
137 - media-libs/openexr:0=
138 - media-libs/qhull:=
139 - sci-libs/libigl
140 - sci-libs/nlopt
141 - >=sci-mathematics/cgal-5.0:=
142 - sys-apps/dbus
143 - sys-libs/zlib:=
144 - gui? (
145 - dev-libs/glib:2
146 - media-libs/glew:0=
147 - net-misc/curl
148 - virtual/glu
149 - virtual/opengl
150 - x11-libs/gtk+:3
151 - >=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
152 - )
153 -"
154 -DEPEND="${RDEPEND}
155 - media-libs/qhull[static-libs]
156 - test? ( dev-cpp/gtest )
157 -"
158 -
159 -PATCHES=(
160 - "${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
161 - "${FILESDIR}/freecad-dialog-2.2.53.4.patch"
162 - "${FILESDIR}/missing-imports-${PV}.patch"
163 - "${FILESDIR}/version-suffix-${PV}.patch"
164 -)
165 -
166 -src_unpack() {
167 - unpack ${P}.tar.gz
168 - mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
169 - mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
170 - mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
171 - mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
172 - mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
173 - cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
174 -
175 - use profiles && unpack ${P}-profiles.zip &&
176 - if use profiles ; then
177 - cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles"
178 - fi
179 -}
180 -
181 -src_configure() {
182 - use gui && setup-wxwidgets
183 -
184 - CMAKE_BUILD_TYPE=Release
185 - local mycmakeargs=(
186 - -DSLIC3R_BUILD_TESTS=$(usex test)
187 - -DSLIC3R_FHS=ON
188 - -DSLIC3R_GTK=3
189 - -DSLIC3R_GUI=$(usex gui)
190 - -DSLIC3R_PCH=OFF
191 - -DSLIC3R_WX_STABLE=ON
192 - -Wno-dev
193 - )
194 -
195 - cmake_src_configure
196 -}
197 -
198 -src_install() {
199 - cmake_src_install
200 -
201 - if use gui; then
202 - newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
203 - dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
204 - fi
205 -}