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: 1653856483.995dcbc45381e55d23c07008f9c8faadf19f2ecc.egorr.berd@gentoo
1 commit: 995dcbc45381e55d23c07008f9c8faadf19f2ecc
2 Author: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
3 AuthorDate: Sun May 29 20:34:43 2022 +0000
4 Commit: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
5 CommitDate: Sun May 29 20:34:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=995dcbc4
7
8 media-gfx/superslicer: drop 2.3.57.7-r1
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.7.patch | 188 ---------------------
14 .../files/version-suffix-2.3.57.7.patch | 38 -----
15 .../superslicer/superslicer-2.3.57.7-r1.ebuild | 109 ------------
16 4 files changed, 337 deletions(-)
17
18 diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
19 index d09c41d47..974642d1f 100644
20 --- a/media-gfx/superslicer/Manifest
21 +++ b/media-gfx/superslicer/Manifest
22 @@ -5,7 +5,5 @@ DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2
23 DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d
24 DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
25 DIST superslicer-2.3.57.12.tar.gz 32472874 BLAKE2B 600ed29724476f2812c7bbea9bc26d1b54f2291d8994b883ad9da64899ad181ca19e3975865f190b1a3125341456fb38f982f5c20a5d4a0c36459de498a6588b SHA512 3830d275ef9dc5a4b1c62451e532012995647ba276a65007ae2160a89f2c044e18bad851dcf225f768a7023d00e92f398013ffdf1e1fd75e137f37e93edc8f59
26 -DIST superslicer-2.3.57.7-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
27 -DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65
28 DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
29 DIST superslicer-2.3.57.9.tar.gz 32406027 BLAKE2B 66c6c5cfb044165dd8cce3030fc9e6c29df078aaca94dfecef4c5943a21667fc9dd12d88e821952382e7556775119daf221030b2bb25fc1e52071c4f367fe041 SHA512 bf421afa55ad7d1c3eafa8dc15efb20ab463e21b78f5e03d188f68d018a7b32cd24c2163974d90eff80e1ebb39a669b3e877a614e1040bc31c7160cca7ffc554
30
31 diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.7.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.7.patch
32 deleted file mode 100644
33 index a3354237c..000000000
34 --- a/media-gfx/superslicer/files/missing-imports-2.3.57.7.patch
35 +++ /dev/null
36 @@ -1,188 +0,0 @@
37 ---- a/src/libslic3r/GCode.cpp
38 -+++ b/src/libslic3r/GCode.cpp
39 -@@ -19,6 +19,7 @@
40 - #include <math.h>
41 - #include <string_view>
42 - #include <map>
43 -+#include <unordered_set>
44 -
45 - #include <boost/algorithm/string.hpp>
46 - #include <boost/algorithm/string/find.hpp>
47 ---- a/src/libslic3r/GCodeWriter.cpp
48 -+++ b/src/libslic3r/GCodeWriter.cpp
49 -@@ -5,6 +5,7 @@
50 - #include <iostream>
51 - #include <map>
52 - #include <assert.h>
53 -+#include <boost/lexical_cast.hpp>
54 -
55 - #define FLAVOR_IS(val) this->config.gcode_flavor.value == val
56 - #define FLAVOR_IS_NOT(val) this->config.gcode_flavor.value != val
57 ---- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
58 -+++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
59 -@@ -11,5 +11,6 @@
60 -
61 - #include <numeric>
62 - #include <unordered_set>
63 -+#include <boost/log/trivial.hpp>
64 -
65 - namespace Slic3r {
66 ---- a/src/libslic3r/MedialAxis.cpp
67 -+++ b/src/libslic3r/MedialAxis.cpp
68 -@@ -11,6 +11,7 @@
69 - #include <algorithm>
70 - #include <cassert>
71 - #include <list>
72 -+#include <boost/log/trivial.hpp>
73 -
74 - namespace Slic3r {
75 - int count_error = 0;
76 ---- a/src/libslic3r/Format/CWS.cpp
77 -+++ b/src/libslic3r/Format/CWS.cpp
78 -@@ -1,5 +1,7 @@
79 - #include "libslic3r/Format/CWS.hpp"
80 - #include "libslic3r/PrintConfig.hpp"
81 - #include "libslic3r/Time.hpp"
82 -+#include <boost/filesystem.hpp>
83 -+#include <boost/log/trivial.hpp>
84 -
85 - namespace Slic3r {
86 ---- a/src/libslic3r/PrintBase.cpp
87 -+++ b/src/libslic3r/PrintBase.cpp
88 -@@ -1,5 +1,6 @@
89 - #include "Exception.hpp"
90 - #include "PrintBase.hpp"
91 -
92 -+#include <regex>
93 - #include <boost/filesystem.hpp>
94 - #include <boost/lexical_cast.hpp>
95 ---- a/src/libslic3r/PrintObject.cpp
96 -+++ b/src/libslic3r/PrintObject.cpp
97 -@@ -14,6 +14,7 @@
98 - #include "Fill/FillAdaptive.hpp"
99 - #include "Format/STL.hpp"
100 -
101 -+#include <chrono>
102 - #include <utility>
103 - #include <boost/log/trivial.hpp>
104 - #include <float.h>
105 ---- a/src/libslic3r/AppConfig.cpp
106 -+++ b/src/libslic3r/AppConfig.cpp
107 -@@ -10,6 +10,7 @@
108 -
109 - #include <boost/filesystem/path.hpp>
110 - #include <boost/filesystem/operations.hpp>
111 -+#include <boost/locale/generator.hpp>
112 - #include <boost/nowide/cenv.hpp>
113 - #include <boost/nowide/fstream.hpp>
114 - #include <boost/property_tree/ini_parser.hpp>
115 ---- a/src/libslic3r/PlaceholderParser.cpp
116 -+++ b/src/libslic3r/PlaceholderParser.cpp
117 -@@ -6,6 +6,7 @@
118 - #include <iomanip>
119 - #include <sstream>
120 - #include <map>
121 -+#include <regex>
122 - #ifdef _MSC_VER
123 - #include <stdlib.h> // provides **_environ
124 - #else
125 -@@ -26,6 +27,7 @@
126 -
127 - #include <boost/algorithm/string.hpp>
128 - #include <boost/nowide/convert.hpp>
129 -+#include <boost/log/trivial.hpp>
130 -
131 - // Spirit v2.5 allows you to suppress automatic generation
132 - // of predefined terminals to speed up complation. With
133 ---- a/src/slic3r/GUI/Preferences.cpp
134 -+++ b/src/slic3r/GUI/Preferences.cpp
135 -@@ -4,6 +4,7 @@
136 - #include "Plater.hpp"
137 - #include "I18N.hpp"
138 - #include "libslic3r/AppConfig.hpp"
139 -+#include <boost/filesystem.hpp>
140 - #include <wx/notebook.h>
141 -
142 - namespace Slic3r {
143 ---- a/src/slic3r/GUI/CalibrationAbstractDialog.cpp
144 -+++ b/src/slic3r/GUI/CalibrationAbstractDialog.cpp
145 -@@ -5,6 +5,7 @@
146 - #include "GUI.hpp"
147 - #include "GUI_ObjectList.hpp"
148 - #include "Tab.hpp"
149 -+#include <boost/filesystem.hpp>
150 - #include <wx/scrolwin.h>
151 - #include <wx/display.h>
152 - #include <wx/file.h>
153 ---- a/src/slic3r/GUI/Tab.cpp
154 -+++ b/src/slic3r/GUI/Tab.cpp
155 -@@ -22,6 +22,7 @@
156 -
157 - #include <wx/bmpcbox.h>
158 - #include <wx/bmpbuttn.h>
159 -+#include <wx/collpane.h>
160 - #include <wx/treectrl.h>
161 - #include <wx/imaglist.h>
162 - #include <wx/settings.h>
163 -@@ -33,6 +34,7 @@
164 - #include <boost/algorithm/string/replace.hpp>#include <boost/algorithm/string/trim.hpp>
165 - #include <boost/filesystem.hpp>
166 - #include <boost/filesystem/path.hpp>
167 -+#include <boost/lexical_cast.hpp>
168 - #include "wxExtensions.hpp"
169 - #include "PresetComboBoxes.hpp"
170 - #include <wx/wupdlock.h>
171 ---- a/src/slic3r/GUI/GUI_ObjectList.cpp
172 -+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
173 -@@ -15,4 +15,5 @@
174 - #include "Selection.hpp"
175 -
176 - #include <boost/algorithm/string.hpp>
177 -+#include <boost/log/trivial.hpp>
178 - #include "slic3r/Utils/FixModelByWin10.hpp"
179 -
180 - #ifdef __WXMSW__
181 ---- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
182 -+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
183 -@@ -5,6 +5,7 @@
184 - #include <vector>
185 - #include <string>
186 - #include <boost/algorithm/string.hpp>
187 -+#include <boost/log/trivial.hpp>
188 -
189 - #include <wx/sizer.h>
190 - #include <wx/stattext.h>
191 ---- a/src/slic3r/GUI/3DBed.cpp
192 -+++ b/src/slic3r/GUI/3DBed.cpp
193 -@@ -16,6 +16,10 @@
194 -
195 - #include <boost/algorithm/string/predicate.hpp>
196 - #include <boost/filesystem/operations.hpp>
197 -+#include <boost/locale/generator.hpp>
198 - #include <boost/log/trivial.hpp>
199 -+#include <boost/property_tree/ini_parser.hpp>
200 -+#include <boost/property_tree/ptree.hpp>
201 -+#include <boost/nowide/fstream.hpp>
202 -
203 - static const float GROUND_Z = -0.02f;
204 ---- a/src/slic3r/Utils/PresetUpdater.cpp
205 -+++ b/src/slic3r/Utils/PresetUpdater.cpp
206 -@@ -12,6 +12,8 @@
207 - #include <boost/filesystem/fstream.hpp>
208 - #include <boost/lexical_cast.hpp>
209 - #include <boost/log/trivial.hpp>
210 -+#include <boost/property_tree/ptree.hpp>
211 -+#include <boost/property_tree/json_parser.hpp>
212 -
213 - #include <wx/app.h>
214 - #include <wx/msgdlg.h>
215 ---- a/src/slic3r/GUI/Search.cpp
216 -+++ b/src/slic3r/GUI/Search.cpp
217 -@@ -2,6 +2,7 @@
218 -
219 - #include <cstddef>
220 - #include <string>
221 -+#include <regex>
222 - #include <boost/algorithm/string.hpp>
223 - #include <boost/optional.hpp>
224 - #include <boost/nowide/convert.hpp>
225
226 diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.7.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.7.patch
227 deleted file mode 100644
228 index f140f8e18..000000000
229 --- a/media-gfx/superslicer/files/version-suffix-2.3.57.7.patch
230 +++ /dev/null
231 @@ -1,38 +0,0 @@
232 ---- a/version.inc
233 -+++ b/version.inc
234 -@@ -4,9 +4,9 @@
235 - # name of the slicer
236 - set(SLIC3R_APP_NAME "SuperSlicer")
237 - # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
238 --set(SLIC3R_APP_KEY "SuperSlicer")
239 -+set(SLIC3R_APP_KEY "SuperSlicer2.3")
240 - # exe name of the slicer, should be lowercase and valid in all os
241 --set(SLIC3R_APP_CMD "superslicer")
242 -+set(SLIC3R_APP_CMD "superslicer-2.3")
243 - # versions
244 - set(SLIC3R_VERSION "2.3.57")
245 - set(SLIC3R_VERSION_FULL "2.3.57.7")
246 ---- a/src/platform/unix/Gcodeviewer.desktop.in
247 -+++ b/src/platform/unix/Gcodeviewer.desktop.in
248 -@@ -1,5 +1,5 @@
249 - [Desktop Entry]
250 --Name=@GCODEVIEWER_APP_NAME@
251 -+Name=@GCODEVIEWER_APP_KEY@
252 - Comment=G-code viewer of Slic3r
253 - Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
254 - Icon=@GCODEVIEWER_APP_KEY@
255 ---- a/src/platform/unix/Slic3r.desktop.in
256 -+++ b/src/platform/unix/Slic3r.desktop.in
257 -@@ -1,5 +1,5 @@
258 - [Desktop Entry]
259 --Name=@SLIC3R_APP_NAME@
260 -+Name=@SLIC3R_APP_KEY@
261 - GenericName=3D Printing Software
262 - Comment=G-code generator for 3D printers
263 - Icon=@SLIC3R_APP_KEY@
264 -@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
265 - Categories=Graphics;3DGraphics;Engineering;
266 - Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
267 - StartupNotify=false
268 --StartupWMClass=@SLIC3R_APP_KEY@
269 -+StartupWMClass=@SLIC3R_APP_NAME@
270
271 diff --git a/media-gfx/superslicer/superslicer-2.3.57.7-r1.ebuild b/media-gfx/superslicer/superslicer-2.3.57.7-r1.ebuild
272 deleted file mode 100644
273 index b352df777..000000000
274 --- a/media-gfx/superslicer/superslicer-2.3.57.7-r1.ebuild
275 +++ /dev/null
276 @@ -1,109 +0,0 @@
277 -# Copyright 2021-2022 Gentoo Authors
278 -# Distributed under the terms of the GNU General Public License v2
279 -
280 -EAPI=7
281 -
282 -WX_GTK_VER="3.0-gtk3"
283 -
284 -inherit xdg cmake desktop wxwidgets
285 -
286 -MY_PN="SuperSlicer"
287 -DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
288 -HOMEPAGE="https://github.com/supermerill/SuperSlicer"
289 -SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
290 - profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.zip -> ${P}-profiles.zip )"
291 -S="${WORKDIR}/${MY_PN}-${PV}"
292 -
293 -LICENSE="AGPL-3"
294 -SLOT="23"
295 -KEYWORDS="~amd64"
296 -IUSE="gui test profiles"
297 -
298 -# tests fail to link with USE=-gui, bug #760096
299 -REQUIRED_USE="test? ( gui )"
300 -RESTRICT="!test? ( test )"
301 -
302 -BDEPEND="profiles? ( app-arch/unzip )"
303 -RDEPEND="
304 - dev-cpp/eigen:3
305 - dev-cpp/tbb
306 - >=dev-libs/boost-1.73.0:=[nls,threads(+)]
307 - dev-libs/cereal
308 - dev-libs/expat
309 - dev-libs/c-blosc
310 - dev-libs/gmp:=
311 - >=dev-libs/miniz-2.1.0-r2
312 - dev-libs/mpfr:=
313 - >=media-gfx/openvdb-5.0.0
314 - media-libs/ilmbase:=
315 - media-libs/libpng:0=
316 - media-libs/openexr:0=
317 - media-libs/qhull:=
318 - sci-libs/libigl
319 - sci-libs/nlopt
320 - >=sci-mathematics/cgal-5.0:=
321 - sys-apps/dbus
322 - sys-libs/zlib:=
323 - gui? (
324 - dev-libs/glib:2
325 - media-libs/glew:0=
326 - net-misc/curl
327 - virtual/glu
328 - virtual/opengl
329 - x11-libs/gtk+:3
330 - >=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
331 - )
332 -"
333 -DEPEND="${RDEPEND}
334 - media-libs/qhull[static-libs]
335 - test? ( dev-cpp/gtest )
336 -"
337 -
338 -PATCHES=(
339 - "${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
340 - "${FILESDIR}/freecad-dialog-2.2.53.4.patch"
341 - "${FILESDIR}/missing-imports-${PV}.patch"
342 - "${FILESDIR}/string-to-char-conversion-2.3.56.9.patch"
343 - "${FILESDIR}/version-suffix-${PV}.patch"
344 -)
345 -
346 -src_unpack() {
347 - unpack ${P}.tar.gz
348 - mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
349 - mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
350 - mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
351 - mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
352 - mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
353 - cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
354 -
355 - use profiles && unpack ${P}-profiles.zip &&
356 - if use profiles ; then
357 - cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles"
358 - fi
359 -}
360 -
361 -src_configure() {
362 - use gui && setup-wxwidgets
363 -
364 - CMAKE_BUILD_TYPE=Release
365 - local mycmakeargs=(
366 - -DSLIC3R_BUILD_TESTS=$(usex test)
367 - -DSLIC3R_FHS=ON
368 - -DSLIC3R_GTK=3
369 - -DSLIC3R_GUI=$(usex gui)
370 - -DSLIC3R_PCH=OFF
371 - -DSLIC3R_WX_STABLE=ON
372 - -Wno-dev
373 - )
374 -
375 - cmake_src_configure
376 -}
377 -
378 -src_install() {
379 - cmake_src_install
380 -
381 - if use gui; then
382 - newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
383 - dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
384 - fi
385 -}