Gentoo Archives: gentoo-commits

From: Piotr Karbowski <slashbeast@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/
Date: Wed, 28 Dec 2022 18:13:23
Message-Id: 1672251196.3fbbb57dc6fa7246c5ce60c71c7fb9289bc3e15f.slashbeast@gentoo
1 commit: 3fbbb57dc6fa7246c5ce60c71c7fb9289bc3e15f
2 Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 28 18:12:45 2022 +0000
4 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 28 18:13:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbbb57d
7
8 media-gfx/superslicer: drop old.
9
10 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
11
12 media-gfx/superslicer/Manifest | 2 -
13 ...perslicer-2.4.58.3-AppConfig-include-I18N.patch | 12 -
14 ....3-CreateMMUTiledCanvas-include-wx-rawbmp.patch | 12 -
15 .../superslicer-2.4.58.3-boost-1.79-port-v2.patch | 244 ---------------------
16 .../files/superslicer-2.4.58.3-cereal.patch | 70 ------
17 .../files/superslicer-2.4.58.3-openexr3.patch | 77 -------
18 .../superslicer-2.4.58.3-wxgtk3-wayland.patch | 21 --
19 .../superslicer/superslicer-2.4.58.3-r1.ebuild | 97 --------
20 .../superslicer/superslicer-2.5.59.0-r1.ebuild | 98 ---------
21 9 files changed, 633 deletions(-)
22
23 diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
24 index ef2d980d92d4..80d31364ef86 100644
25 --- a/media-gfx/superslicer/Manifest
26 +++ b/media-gfx/superslicer/Manifest
27 @@ -1,4 +1,2 @@
28 -DIST superslicer-2.4.58.3-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
29 -DIST superslicer-2.4.58.3.tar.gz 45203382 BLAKE2B 822af2a1cb8978b21f8efdc0eb4841ec1d86517fd07782a8dfa6be2a58514dc3e772221dca40ff62808cb798fc4f51484b24e847328a7a6f154708431f0c4d3b SHA512 00302fba9ada1cc5df3c58f42fdb7f98322f94de7b78876c6a54a2229ae289e785082ea7a69f67bee54321fc4d97811675eeb70932e5774ab78ca8859343dd4d
30 DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
31 DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
32
33 diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch
34 deleted file mode 100644
35 index c5e7398e5bdd..000000000000
36 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch
37 +++ /dev/null
38 @@ -1,12 +0,0 @@
39 -diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
40 -index 59910e6..c35986c 100644
41 ---- a/src/libslic3r/AppConfig.cpp
42 -+++ b/src/libslic3r/AppConfig.cpp
43 -@@ -1,6 +1,7 @@
44 - #include <boost/filesystem.hpp>
45 - #include "libslic3r/libslic3r.h"
46 - #include "libslic3r/Utils.hpp"
47 -+#include "libslic3r/I18N.hpp"
48 - #include "AppConfig.hpp"
49 - #include "Exception.hpp"
50 - #include "LocalesUtils.hpp"
51
52 diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch
53 deleted file mode 100644
54 index c2e3a3ef8f39..000000000000
55 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch
56 +++ /dev/null
57 @@ -1,12 +0,0 @@
58 -diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
59 -index be157ea..d63eb11 100644
60 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
61 -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
62 -@@ -40,6 +40,7 @@
63 - #include <wx/odcombo.h>
64 - #include <wx/textctrl.h>
65 - #include <wx/wrapsizer.h>
66 -+#include <wx/rawbmp.h>
67 - #include "wxExtensions.hpp"
68 -
69 - #include <boost/filesystem/path.hpp>
70
71 diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch
72 deleted file mode 100644
73 index 0c1f31a95b72..000000000000
74 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch
75 +++ /dev/null
76 @@ -1,244 +0,0 @@
77 -diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
78 -index 7c8029c..4791f06 100644
79 ---- a/src/hints/HintsToPot.cpp
80 -+++ b/src/hints/HintsToPot.cpp
81 -@@ -9,7 +9,7 @@
82 -
83 - bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
84 - {
85 -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
86 -+ boost::nowide::ofstream file(path.string(), std::ios_base::app);
87 - for (const auto& element : data)
88 - {
89 - //Example of .pot element
90 -diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
91 -index 39b590e..b2a8dce 100644
92 ---- a/src/libslic3r/AppConfig.cpp
93 -+++ b/src/libslic3r/AppConfig.cpp
94 -@@ -1,3 +1,4 @@
95 -+#include <boost/filesystem.hpp>
96 - #include "libslic3r/libslic3r.h"
97 - #include "libslic3r/Utils.hpp"
98 - #include "AppConfig.hpp"
99 -diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
100 -index d811ddc..1a70230 100644
101 ---- a/src/libslic3r/AppConfig.hpp
102 -+++ b/src/libslic3r/AppConfig.hpp
103 -@@ -5,6 +5,7 @@
104 - #include <map>
105 - #include <string>
106 -
107 -+#include <boost/filesystem/path.hpp>
108 - #include <boost/algorithm/string/trim_all.hpp>
109 -
110 - #include "libslic3r/Config.hpp"
111 -diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
112 -index 5bf5205..7b87052 100644
113 ---- a/src/libslic3r/LocalesUtils.cpp
114 -+++ b/src/libslic3r/LocalesUtils.cpp
115 -@@ -1,3 +1,4 @@
116 -+#include <boost/lexical_cast.hpp>
117 - #include "LocalesUtils.hpp"
118 -
119 - #ifdef _WIN32
120 -diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
121 -index aa33fb6..277a4b4 100644
122 ---- a/src/libslic3r/Preset.cpp
123 -+++ b/src/libslic3r/Preset.cpp
124 -@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
125 - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
126 - {
127 - ptree tree;
128 -- boost::filesystem::ifstream ifs(path);
129 -+ boost::nowide::ifstream ifs(path.string());
130 - boost::property_tree::read_ini(ifs, tree);
131 - return VendorProfile::from_ini(tree, path, load_all);
132 - }
133 -diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
134 -index 89212f2..be157ea 100644
135 ---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
136 -+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
137 -@@ -18,6 +18,11 @@
138 - #include <wx/notebook.h>
139 - #include "Notebook.hpp"
140 -
141 -+#include <boost/filesystem.hpp>
142 -+#include <boost/property_tree/ptree.hpp>
143 -+#include <boost/property_tree/ini_parser.hpp>
144 -+#include <boost/log/trivial.hpp>
145 -+
146 - #include "MainFrame.hpp"
147 - #include "wxExtensions.hpp"
148 -
149 -diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
150 -index fcb7472..866ebae 100644
151 ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
152 -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
153 -@@ -14,6 +14,7 @@
154 - #include <boost/log/trivial.hpp>
155 - #include <boost/dll/runtime_symbol_info.hpp>
156 - #include <boost/algorithm/string/replace.hpp>
157 -+#include <boost/nowide/fstream.hpp>
158 -
159 - #include <wx/filename.h>
160 - #include <wx/stattext.h>
161 -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
162 -
163 - } // namespace GUI
164 - } // namespace Slic3r
165 --#endif // __linux__
166 -\ No newline at end of file
167 -+#endif // __linux__
168 -diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp
169 -index ea7142c..1d75ba7 100644
170 ---- a/src/slic3r/GUI/FreeCADDialog.cpp
171 -+++ b/src/slic3r/GUI/FreeCADDialog.cpp
172 -@@ -38,6 +38,7 @@
173 - #include <boost/log/trivial.hpp>
174 - #include <boost/property_tree/ptree.hpp>
175 - #include <boost/property_tree/json_parser.hpp>
176 -+#include <boost/nowide/fstream.hpp>
177 -
178 - // hack for process.hpp : it uses pid_t to set it as alias of int, but vc_x64_lib (wx thingy) as a '#define pid_t int'
179 - // and so boost/process has a line 'typedef int int'instead of 'typedef int pid_t' that makes it crash
180 -@@ -321,7 +322,7 @@ bool FreeCADDialog::load_text_from_file(const boost::filesystem::path &path) {
181 - try {
182 - std::locale loc = boost::locale::generator()("en_US.UTF-8");
183 - // Open the stream to 'lock' the file.
184 -- boost::filesystem::ifstream in;
185 -+ boost::nowide::ifstream in;
186 - in.imbue(loc);
187 - in.open(path);
188 - // Obtain the size of the file.
189 -@@ -368,7 +369,7 @@ bool FreeCADDialog::write_text_in_file(const wxString &towrite, const boost::fil
190 - boost::filesystem::create_directories(file.parent_path());
191 - std::locale loc = boost::locale::generator()("en_US.UTF-8");
192 - // Open the stream to 'lock' the file.
193 -- boost::filesystem::ofstream out;
194 -+ boost::nowide::ofstream out;
195 - out.imbue(loc);
196 - out.open(file);
197 - out << towrite;
198 -diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
199 -index 7851030..4cdd242 100644
200 ---- a/src/slic3r/GUI/GUI_App.cpp
201 -+++ b/src/slic3r/GUI/GUI_App.cpp
202 -@@ -19,6 +19,7 @@
203 - #include <boost/lexical_cast.hpp>
204 - #include <boost/log/trivial.hpp>
205 - #include <boost/nowide/convert.hpp>
206 -+#include <boost/nowide/fstream.hpp>
207 -
208 - #include <wx/stdpaths.h>
209 - #include <wx/imagpng.h>
210 -diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
211 -index 3291630..3a984bf 100644
212 ---- a/src/slic3r/GUI/HintNotification.cpp
213 -+++ b/src/slic3r/GUI/HintNotification.cpp
214 -@@ -14,12 +14,14 @@
215 - #include "libslic3r/Config.hpp"
216 - #include "libslic3r/PrintConfig.hpp"
217 -
218 -+#include <map>
219 -+
220 - #include <boost/algorithm/string/replace.hpp>
221 - #include <boost/filesystem.hpp>
222 - #include <boost/nowide/fstream.hpp>
223 - #include <boost/log/trivial.hpp>
224 - #include <boost/property_tree/ini_parser.hpp>
225 --#include <map>
226 -+
227 - #include <cereal/archives/binary.hpp>
228 - #include <cereal/types/string.hpp>
229 - #include <cereal/types/vector.hpp>
230 -@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
231 -
232 - void write_used_binary(const std::vector<std::string>& ids)
233 - {
234 -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
235 -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
236 - cereal::BinaryOutputArchive archive(file);
237 - HintsCerealData cd { ids };
238 - try
239 -@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
240 - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
241 - return;
242 - }
243 -- boost::filesystem::ifstream file(path);
244 -+ boost::nowide::ifstream file(path.string());
245 - cereal::BinaryInputArchive archive(file);
246 - HintsCerealData cd;
247 - try
248 -diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
249 -index 523e52c..bd07f02 100644
250 ---- a/src/slic3r/GUI/Preferences.cpp
251 -+++ b/src/slic3r/GUI/Preferences.cpp
252 -@@ -12,6 +12,7 @@
253 - #include "OG_CustomCtrl.hpp"
254 - #include "wxExtensions.hpp"
255 -
256 -+#include <boost/algorithm/string/split.hpp>
257 - #include <boost/filesystem.hpp>
258 - #include <boost/filesystem/path.hpp>
259 -
260 -diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp
261 -index 5a4a1e2..672bdfa 100644
262 ---- a/src/slic3r/GUI/ScriptExecutor.cpp
263 -+++ b/src/slic3r/GUI/ScriptExecutor.cpp
264 -@@ -4,6 +4,13 @@
265 - #include "Tab.hpp"
266 - #include "libslic3r/PresetBundle.hpp"
267 - #include "libslic3r/Print.hpp"
268 -+#include <boost/log/trivial.hpp>
269 -+#include <boost/lexical_cast.hpp>
270 -+#include <boost/algorithm/string/trim_all.hpp>
271 -+#include <boost/algorithm/string/erase.hpp>
272 -+#include <boost/algorithm/string/split.hpp>
273 -+#include <boost/filesystem.hpp>
274 -+#include <boost/filesystem/string_file.hpp>
275 -
276 - #include <string>
277 -
278 -diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
279 -index 13a4ac0..eb63f2a 100644
280 ---- a/src/slic3r/GUI/Tab.cpp
281 -+++ b/src/slic3r/GUI/Tab.cpp
282 -@@ -36,6 +36,8 @@
283 - #include <boost/filesystem.hpp>
284 - #include <boost/filesystem/path.hpp>
285 - #include <boost/lexical_cast.hpp>
286 -+#include <boost/nowide/fstream.hpp>
287 -+#include <boost/log/trivial.hpp>
288 -
289 - #include "wxExtensions.hpp"
290 - #include "PresetComboBoxes.hpp"
291 -@@ -1692,7 +1694,7 @@ std::vector<Slic3r::GUI::PageShp> Tab::create_pages(std::string setting_type_nam
292 -
293 - //read file
294 - //std::ifstream filestream(ui_layout_file.c_str());
295 -- boost::filesystem::ifstream filestream(ui_layout_file);
296 -+ boost::nowide::ifstream filestream(ui_layout_file);
297 - std::string full_line;
298 - while (std::getline(filestream, full_line)) {
299 - //remove spaces
300 -diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
301 -index 5fbe94e..b760559 100644
302 ---- a/src/slic3r/Utils/Http.cpp
303 -+++ b/src/slic3r/Utils/Http.cpp
304 -@@ -11,6 +11,7 @@
305 - #include <boost/filesystem.hpp>
306 - #include <boost/format.hpp>
307 - #include <boost/log/trivial.hpp>
308 -+#include <boost/nowide/fstream.hpp>
309 -
310 - #include <curl/curl.h>
311 -
312 -@@ -52,7 +53,7 @@ namespace Slic3r {
313 - % error;
314 - })
315 - .on_complete([&](std::string body, unsigned /* http_status */) {
316 -- boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
317 -+ boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
318 - file.write(body.c_str(), body.size());
319 - file.close();
320 - boost::filesystem::rename(tmp_path, target_path);
321
322 diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch
323 deleted file mode 100644
324 index 7b3e179a05f5..000000000000
325 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch
326 +++ /dev/null
327 @@ -1,70 +0,0 @@
328 -diff --git a/cmake/modules/Findcereal.cmake b/cmake/modules/Findcereal.cmake
329 -deleted file mode 100644
330 -index b482975..0000000
331 ---- a/cmake/modules/Findcereal.cmake
332 -+++ /dev/null
333 -@@ -1,26 +0,0 @@
334 --set(_q "")
335 --if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
336 -- set(_q QUIET)
337 -- set(_quietly TRUE)
338 --endif()
339 --find_package(${CMAKE_FIND_PACKAGE_NAME} ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG ${_q})
340 --
341 --if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FOUND)
342 -- # Fall-back solution to find the Cereal serialization library header file
343 -- include(CheckIncludeFileCXX)
344 -- add_library(cereal INTERFACE)
345 -- target_include_directories(cereal INTERFACE include)
346 --
347 -- if (_quietly)
348 -- set(CMAKE_REQUIRED_QUIET ON)
349 -- endif()
350 -- CHECK_INCLUDE_FILE_CXX("cereal/cereal.hpp" HAVE_CEREAL_H)
351 --
352 -- if (NOT HAVE_CEREAL_H)
353 -- if (${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
354 -- message(FATAL_ERROR "Cereal library not found. Please install the dependency.")
355 -- elseif(NOT _quietly)
356 -- message(WARNING "Cereal library not found.")
357 -- endif()
358 -- endif ()
359 --endif()
360 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
361 -index ec44417..aab1348 100644
362 ---- a/src/CMakeLists.txt
363 -+++ b/src/CMakeLists.txt
364 -@@ -141,7 +141,7 @@ if (NOT WIN32)
365 - set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
366 - endif ()
367 -
368 --target_link_libraries(Slic3r libslic3r cereal)
369 -+target_link_libraries(Slic3r libslic3r)
370 - if (APPLE)
371 - # add_compile_options(-stdlib=libc++)
372 - # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
373 -diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
374 -index 21aab3b..8c6b705 100644
375 ---- a/src/libslic3r/CMakeLists.txt
376 -+++ b/src/libslic3r/CMakeLists.txt
377 -@@ -358,7 +358,6 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
378 - target_link_libraries(libslic3r
379 - libnest2d
380 - admesh
381 -- cereal
382 - libigl
383 - miniz
384 - boost_libs
385 -diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
386 -index 3f231ef..ffd9a3f 100644
387 ---- a/src/slic3r/CMakeLists.txt
388 -+++ b/src/slic3r/CMakeLists.txt
389 -@@ -293,7 +293,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3
390 -
391 - encoding_check(libslic3r_gui)
392 -
393 --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
394 -+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
395 -
396 - if (MSVC)
397 - target_link_libraries(libslic3r_gui Setupapi.lib)
398
399 diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch
400 deleted file mode 100644
401 index 7bd04e6fad10..000000000000
402 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch
403 +++ /dev/null
404 @@ -1,77 +0,0 @@
405 -diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
406 -index 4fde5fa..566e73a 100644
407 ---- a/cmake/modules/FindOpenVDB.cmake
408 -+++ b/cmake/modules/FindOpenVDB.cmake
409 -@@ -347,28 +347,10 @@ macro(just_fail msg)
410 - return()
411 - endmacro()
412 -
413 --find_package(IlmBase QUIET)
414 --if(NOT IlmBase_FOUND)
415 -- pkg_check_modules(IlmBase QUIET IlmBase)
416 --endif()
417 --if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
418 -- message(STATUS "Falling back to IlmBase found by pkg-config...")
419 --
420 -- find_library(IlmHalf_LIBRARY NAMES Half)
421 -- if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
422 -- just_fail("IlmBase::Half can not be found!")
423 -- endif()
424 --
425 -- add_library(IlmBase::Half UNKNOWN IMPORTED)
426 -- set_target_properties(IlmBase::Half PROPERTIES
427 -- IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
428 -- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
429 --elseif(NOT IlmBase_FOUND)
430 -- just_fail("IlmBase::Half can not be found!")
431 --endif()
432 - find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
433 - find_package(ZLIB ${_quiet} ${_required})
434 - find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
435 -+find_package(Imath CONFIG)
436 -
437 - # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
438 - # which we can query for optional deps. This basically runs ldd/otoll/objdump
439 -@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST})
440 - set(OpenVDB_USES_LOG4CPLUS ON)
441 - endif()
442 -
443 -- string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
444 -+ string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
445 - if(NOT ${_HAS_DEP} EQUAL -1)
446 - set(OpenVDB_USES_ILM ON)
447 - endif()
448 -@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
449 - find_package(Log4cplus ${_quiet} ${_required})
450 - endif()
451 -
452 --if(OpenVDB_USES_ILM)
453 -- find_package(IlmBase ${_quiet} ${_required})
454 --endif()
455 --
456 --if(OpenVDB_USES_EXR)
457 -+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
458 - find_package(OpenEXR ${_quiet} ${_required})
459 - endif()
460 -
461 -@@ -471,7 +449,7 @@ endif()
462 - set(_OPENVDB_VISIBLE_DEPENDENCIES
463 - Boost::iostreams
464 - Boost::system
465 -- IlmBase::Half
466 -+ Imath::Imath
467 - )
468 -
469 - set(_OPENVDB_DEFINITIONS)
470 -@@ -481,10 +459,7 @@ endif()
471 -
472 - if(OpenVDB_USES_EXR)
473 - list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
474 -- IlmBase::IlmThread
475 -- IlmBase::Iex
476 -- IlmBase::Imath
477 -- OpenEXR::IlmImf
478 -+ OpenEXR::OpenEXR
479 - )
480 - list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
481 - endif()
482
483 diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch
484 deleted file mode 100644
485 index 5f6eb58740ae..000000000000
486 --- a/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch
487 +++ /dev/null
488 @@ -1,21 +0,0 @@
489 -diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
490 -index 330869f..70c472c 100644
491 ---- a/src/slic3r/GUI/GUI.cpp
492 -+++ b/src/slic3r/GUI/GUI.cpp
493 -@@ -33,6 +33,16 @@ class AppConfig;
494 -
495 - namespace GUI {
496 -
497 -+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
498 -+#ifdef __WXGTK3__
499 -+struct ForceX11 {
500 -+ ForceX11() {
501 -+ setenv("GDK_BACKEND", "x11", 1);
502 -+ }
503 -+};
504 -+static struct ForceX11 forcex11;
505 -+#endif
506 -+
507 - #if __APPLE__
508 - IOPMAssertionID assertionID;
509 - #endif
510
511 diff --git a/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild b/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
512 deleted file mode 100644
513 index c8ab9ba7f60f..000000000000
514 --- a/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
515 +++ /dev/null
516 @@ -1,97 +0,0 @@
517 -# Copyright 1999-2022 Gentoo Authors
518 -# Distributed under the terms of the GNU General Public License v2
519 -
520 -EAPI=8
521 -
522 -WX_GTK_VER="3.0-gtk3"
523 -MY_PN="SuperSlicer"
524 -
525 -inherit cmake wxwidgets xdg
526 -
527 -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
528 -HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
529 -SRC_URI="
530 - https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
531 - https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> ${P}-profiles.tar.gz
532 -"
533 -
534 -LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
535 -SLOT="0"
536 -KEYWORDS="~amd64 ~x86"
537 -IUSE="test"
538 -
539 -RESTRICT="test"
540 -
541 -# No dep on sci-libs/libigl, in-tree version cannot build
542 -# static library currently. Using bundled one.
543 -RDEPEND="
544 - dev-cpp/eigen:3
545 - dev-cpp/tbb:=
546 - dev-libs/boost:=[nls]
547 - dev-libs/cereal
548 - dev-libs/expat
549 - dev-libs/glib:2
550 - dev-libs/gmp:=
551 - dev-libs/mpfr:=
552 - dev-libs/imath:=
553 - >=media-gfx/openvdb-8.2:=
554 - net-misc/curl[adns]
555 - media-libs/glew:0=
556 - media-libs/libpng:0=
557 - media-libs/qhull:=
558 - sci-libs/nlopt
559 - >=sci-mathematics/cgal-5.0:=
560 - sys-apps/dbus
561 - sys-libs/zlib:=
562 - virtual/glu
563 - virtual/opengl
564 - x11-libs/gtk+:3
565 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
566 -"
567 -DEPEND="${RDEPEND}
568 - media-libs/qhull[static-libs]
569 -"
570 -
571 -PATCHES=(
572 - "${FILESDIR}/${P}-boost-1.79-port-v2.patch"
573 - "${FILESDIR}/${P}-CreateMMUTiledCanvas-include-wx-rawbmp.patch"
574 - "${FILESDIR}/${P}-AppConfig-include-I18N.patch"
575 - "${FILESDIR}/${P}-cereal.patch"
576 - "${FILESDIR}/${P}-openexr3.patch"
577 - "${FILESDIR}/${P}-wxgtk3-wayland.patch"
578 -)
579 -
580 -S="${WORKDIR}/${MY_PN}-${PV}"
581 -
582 -src_unpack() {
583 - default
584 -
585 - mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
586 -}
587 -
588 -src_configure() {
589 - CMAKE_BUILD_TYPE="Release"
590 -
591 - setup-wxwidgets
592 -
593 - local mycmakeargs=(
594 - -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
595 -
596 - -DSLIC3R_BUILD_TESTS=$(usex test)
597 - -DSLIC3R_FHS=ON
598 - -DSLIC3R_GTK=3
599 - -DSLIC3R_GUI=ON
600 - -DSLIC3R_PCH=OFF
601 - -DSLIC3R_STATIC=OFF
602 - -DSLIC3R_WX_STABLE=ON
603 - -Wno-dev
604 - )
605 -
606 - cmake_src_configure
607 -}
608 -
609 -src_install() {
610 - cmake_src_install
611 -
612 - rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
613 -}
614
615 diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild
616 deleted file mode 100644
617 index ca0ff2b51c74..000000000000
618 --- a/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild
619 +++ /dev/null
620 @@ -1,98 +0,0 @@
621 -# Copyright 1999-2022 Gentoo Authors
622 -# Distributed under the terms of the GNU General Public License v2
623 -
624 -EAPI=8
625 -
626 -WX_GTK_VER="3.0-gtk3"
627 -MY_PN="SuperSlicer"
628 -
629 -inherit cmake wxwidgets xdg
630 -
631 -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
632 -HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
633 -SRC_URI="
634 - https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
635 - https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> ${P}-profiles.tar.gz
636 -"
637 -
638 -LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
639 -SLOT="0"
640 -KEYWORDS="~amd64 ~x86"
641 -IUSE="test"
642 -
643 -RESTRICT="test"
644 -
645 -# No dep on sci-libs/libigl, in-tree version cannot build
646 -# static library currently. Using bundled one.
647 -RDEPEND="
648 - dev-cpp/eigen:3
649 - dev-cpp/tbb:=
650 - dev-libs/boost:=[nls]
651 - dev-libs/cereal
652 - dev-libs/expat
653 - dev-libs/glib:2
654 - dev-libs/gmp:=
655 - dev-libs/mpfr:=
656 - dev-libs/imath:=
657 - >=media-gfx/openvdb-8.2:=
658 - net-misc/curl[adns]
659 - media-libs/glew:0=
660 - media-libs/libpng:0=
661 - media-libs/qhull:=
662 - sci-libs/nlopt
663 - >=sci-mathematics/cgal-5.0:=
664 - sys-apps/dbus
665 - sys-libs/zlib:=
666 - virtual/glu
667 - virtual/opengl
668 - x11-libs/gtk+:3
669 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
670 -"
671 -DEPEND="${RDEPEND}
672 - media-libs/qhull[static-libs]
673 -"
674 -
675 -PATCHES=(
676 - "${FILESDIR}/${P}-openexr3.patch"
677 - "${FILESDIR}/${P}-wxgtk3-wayland.patch"
678 - "${FILESDIR}/${P}-cereal.patch"
679 - "${FILESDIR}/${P}-boost.patch"
680 - "${FILESDIR}/${P}-missing-includes.patch"
681 - "${FILESDIR}/${P}-dont-install-bundled-angelscript.patch"
682 - "${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch"
683 -)
684 -
685 -S="${WORKDIR}/${MY_PN}-${PV}"
686 -
687 -src_unpack() {
688 - default
689 -
690 - mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
691 -}
692 -
693 -src_configure() {
694 - CMAKE_BUILD_TYPE="Release"
695 -
696 - setup-wxwidgets
697 -
698 - local mycmakeargs=(
699 - -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
700 -
701 - -DSLIC3R_BUILD_TESTS=$(usex test)
702 - -DSLIC3R_FHS=ON
703 - -DSLIC3R_GTK=3
704 - -DSLIC3R_GUI=ON
705 - -DSLIC3R_PCH=OFF
706 - -DSLIC3R_STATIC=OFF
707 - -DSLIC3R_WX_STABLE=ON
708 - -Wno-dev
709 - )
710 -
711 - cmake_src_configure
712 -}
713 -
714 -src_install() {
715 - cmake_src_install
716 -
717 - rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
718 -}