commit: a4f373863adad74ac3cba7cdf02ac1634fcee0ab
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 5 17:26:36 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jul 5 17:48:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f37386
media-gfx/superslicer: drop 2.5.59.0-r3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-gfx/superslicer/Manifest | 2 -
....0-boost-1.81-std-wxString-to-std-wstring.patch | 40 ----
.../files/superslicer-2.5.59.0-boost.patch | 256 ---------------------
.../files/superslicer-2.5.59.0-cereal.patch | 53 -----
...2.5.59.0-dont-install-bundled-angelscript.patch | 53 -----
...erslicer-2.5.59.0-fix-gcodeviewer-symlink.patch | 11 -
.../superslicer-2.5.59.0-missing-includes.patch | 36 ---
.../files/superslicer-2.5.59.0-openexr3.patch | 77 -------
.../superslicer-2.5.59.0-wxgtk3-wayland.patch | 21 --
.../superslicer/superslicer-2.5.59.0-r3.ebuild | 102 --------
10 files changed, 651 deletions(-)
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 006a776d5fba..c076101e258a 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,4 +1,2 @@
-DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B
cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939
SHA512
bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
-DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B
da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd
SHA512
1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B
20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e
SHA512
c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7
DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B
ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b
SHA512
af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch
deleted file mode 100644
index 1cb0d9f1afff..000000000000
---
a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:21:43.583075853
+1100
-+++ b/src/slic3r/GUI/PrintHostDialogs.cpp 2022-12-21 10:23:03.902694287
+1100
-@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
- if (size_t extension_start = recent_path.find_last_of('.');
extension_start != std::string::npos)
- m_valid_suffix = recent_path.substr(extension_start);
- // .gcode suffix control
-- auto validate_path = [this](const wxString &path) -> bool {
-- if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
-+ auto validate_path = [this](const std::wstring &path) -> bool {
-+ if (! wxString(path).Lower().EndsWith(m_valid_suffix.Lower())) {
- MessageDialog msg_wingow(this, wxString::Format(_L("Upload
filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix),
wxString(SLIC3R_APP_NAME), wxYES | wxNO);
- if (msg_wingow.ShowModal() == wxID_NO)
- return false;
-@@ -90,7 +90,7 @@ PrintHostSendDialog::PrintHostSendDialog
-
- auto* btn_ok = add_button(wxID_OK, true, _L("Upload"));
- btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
-- if (validate_path(txt_filename->GetValue())) {
-+ if (validate_path(txt_filename->GetValue().ToStdWstring())) {
- post_upload_action = PrintHostPostUploadAction::None;
- EndDialog(wxID_OK);
- }
-@@ -100,7 +100,7 @@ PrintHostSendDialog::PrintHostSendDialog
- if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
- auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
- btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
-- if (validate_path(txt_filename->GetValue())) {
-+ if (validate_path(txt_filename->GetValue().ToStdWstring())) {
- post_upload_action = PrintHostPostUploadAction::StartPrint;
- EndDialog(wxID_OK);
- }
-@@ -111,7 +111,7 @@ PrintHostSendDialog::PrintHostSendDialog
- // Using wxID_MORE as a button identifier to be different from the
other buttons, wxID_MORE has no other meaning here.
- auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and
Simulate"));
- btn_simulate->Bind(wxEVT_BUTTON, [this,
validate_path](wxCommandEvent&) {
-- if (validate_path(txt_filename->GetValue())) {
-+ if (validate_path(txt_filename->GetValue().ToStdWstring())) {
- post_upload_action =
PrintHostPostUploadAction::StartSimulation;
- EndDialog(wxID_OK);
- }
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
deleted file mode 100644
index 4f847aaacb92..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
-index 7c8029cde..4791f0612 100644
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -9,7 +9,7 @@
-
- bool write_to_pot(boost::filesystem::path path, const
std::vector<std::pair<std::string, std::string>>& data)
- {
-- boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
-+ boost::nowide::ofstream file(path.string(), std::ios_base::app);
- for (const auto& element : data)
- {
- //Example of .pot element
-diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
-index f029b3d72..18dc7396e 100644
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -1,3 +1,4 @@
-+#include <boost/filesystem.hpp>
- #include "libslic3r/libslic3r.h"
- #include "libslic3r/Utils.hpp"
- #include "AppConfig.hpp"
-diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
-index d811ddcc2..1a7023061 100644
---- a/src/libslic3r/AppConfig.hpp
-+++ b/src/libslic3r/AppConfig.hpp
-@@ -5,6 +5,7 @@
- #include <map>
- #include <string>
-
-+#include <boost/filesystem/path.hpp>
- #include <boost/algorithm/string/trim_all.hpp>
-
- #include "libslic3r/Config.hpp"
-diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
-index 5bf520568..7b870520b 100644
---- a/src/libslic3r/LocalesUtils.cpp
-+++ b/src/libslic3r/LocalesUtils.cpp
-@@ -1,3 +1,4 @@
-+#include <boost/lexical_cast.hpp>
- #include "LocalesUtils.hpp"
-
- #ifdef _WIN32
-diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
-index 9e9fcda4f..d889e2abf 100644
---- a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
- VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path,
bool load_all)
- {
- ptree tree;
-- boost::filesystem::ifstream ifs(path);
-+ boost::nowide::ifstream ifs(path.string());
- boost::property_tree::read_ini(ifs, tree);
- return VendorProfile::from_ini(tree, path, load_all);
- }
-diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
-index f525c9837..839f0f5e9 100644
---- a/src/libslic3r/Utils.hpp
-+++ b/src/libslic3r/Utils.hpp
-@@ -7,6 +7,7 @@
- #include <type_traits>
- #include <system_error>
-
-+#include <boost/filesystem.hpp>
- #include <boost/system/error_code.hpp>
-
- #include "libslic3r.h"
-diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-index 89212f27f..be157eafa 100644
---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-@@ -18,6 +18,11 @@
- #include <wx/notebook.h>
- #include "Notebook.hpp"
-
-+#include <boost/filesystem.hpp>
-+#include <boost/property_tree/ptree.hpp>
-+#include <boost/property_tree/ini_parser.hpp>
-+#include <boost/log/trivial.hpp>
-+
- #include "MainFrame.hpp"
- #include "wxExtensions.hpp"
-
-diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-index fcb7472e6..866ebaef5 100644
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -14,6 +14,7 @@
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
- #include <boost/algorithm/string/replace.hpp>
-+#include <boost/nowide/fstream.hpp>
-
- #include <wx/filename.h>
- #include <wx/stattext.h>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
-
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
-diff --git a/src/slic3r/GUI/FreeCADDialog.cpp
b/src/slic3r/GUI/FreeCADDialog.cpp
-index 271e3ef2d..6bbdf3907 100644
---- a/src/slic3r/GUI/FreeCADDialog.cpp
-+++ b/src/slic3r/GUI/FreeCADDialog.cpp
-@@ -38,6 +38,7 @@
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
-+#include <boost/nowide/fstream.hpp>
-
- // 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'
- // and so boost/process has a line 'typedef int int'instead of 'typedef int
pid_t' that makes it crash
-@@ -322,7 +323,7 @@ bool FreeCADDialog::load_text_from_file(const
boost::filesystem::path &path) {
- try {
- std::locale loc = boost::locale::generator()("en_US.UTF-8");
- // Open the stream to 'lock' the file.
-- boost::filesystem::ifstream in;
-+ boost::nowide::ifstream in;
- in.imbue(loc);
- in.open(path);
- // Obtain the size of the file.
-@@ -369,7 +370,7 @@ bool FreeCADDialog::write_text_in_file(const wxString
&towrite, const boost::fil
- boost::filesystem::create_directories(file.parent_path());
- std::locale loc = boost::locale::generator()("en_US.UTF-8");
- // Open the stream to 'lock' the file.
-- boost::filesystem::ofstream out;
-+ boost::nowide::ofstream out;
- out.imbue(loc);
- out.open(file);
- out << towrite;
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 4cf21a36c..75b2a8e94 100644
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -19,6 +19,7 @@
- #include <boost/lexical_cast.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/convert.hpp>
-+#include <boost/nowide/fstream.hpp>
-
- #include <wx/stdpaths.h>
- #include <wx/imagpng.h>
-diff --git a/src/slic3r/GUI/HintNotification.cpp
b/src/slic3r/GUI/HintNotification.cpp
-index 32916303f..3a984bf38 100644
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -14,12 +14,14 @@
- #include "libslic3r/Config.hpp"
- #include "libslic3r/PrintConfig.hpp"
-
-+#include <map>
-+
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
--#include <map>
-+
- #include <cereal/archives/binary.hpp>
- #include <cereal/types/string.hpp>
- #include <cereal/types/vector.hpp>
-@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4&
col, bool fading_out, f
-
- void write_used_binary(const std::vector<std::string>& ids)
- {
-- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) /
"cache" / "hints.cereal"), std::ios::binary);
-+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) /
"cache" / "hints.cereal").string(), std::ios::binary);
- cereal::BinaryOutputArchive archive(file);
- HintsCerealData cd { ids };
- try
-@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
- BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal.
File does not exists. " << path.string();
- return;
- }
-- boost::filesystem::ifstream file(path);
-+ boost::nowide::ifstream file(path.string());
- cereal::BinaryInputArchive archive(file);
- HintsCerealData cd;
- try
-diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
-index ffc600b0e..c8080d112 100644
---- a/src/slic3r/GUI/Preferences.cpp
-+++ b/src/slic3r/GUI/Preferences.cpp
-@@ -12,6 +12,7 @@
- #include "OG_CustomCtrl.hpp"
- #include "wxExtensions.hpp"
-
-+#include <boost/algorithm/string/split.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/path.hpp>
-
-diff --git a/src/slic3r/GUI/ScriptExecutor.cpp
b/src/slic3r/GUI/ScriptExecutor.cpp
-index 4565d1aec..6738cada9 100644
---- a/src/slic3r/GUI/ScriptExecutor.cpp
-+++ b/src/slic3r/GUI/ScriptExecutor.cpp
-@@ -4,6 +4,13 @@
- #include "Tab.hpp"
- #include "libslic3r/PresetBundle.hpp"
- #include "libslic3r/Print.hpp"
-+#include <boost/log/trivial.hpp>
-+#include <boost/lexical_cast.hpp>
-+#include <boost/algorithm/string/trim_all.hpp>
-+#include <boost/algorithm/string/erase.hpp>
-+#include <boost/algorithm/string/split.hpp>
-+#include <boost/filesystem.hpp>
-+#include <boost/filesystem/string_file.hpp>
-
- #include <string>
-
-diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
-index 173f0f762..a3eb553c8 100644
---- a/src/slic3r/GUI/Tab.cpp
-+++ b/src/slic3r/GUI/Tab.cpp
-@@ -36,6 +36,8 @@
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/lexical_cast.hpp>
-+#include <boost/nowide/fstream.hpp>
-+#include <boost/log/trivial.hpp>
-
- #include "wxExtensions.hpp"
- #include "PresetComboBoxes.hpp"
-@@ -1692,7 +1694,7 @@ std::vector<Slic3r::GUI::PageShp>
Tab::create_pages(std::string setting_type_nam
-
- //read file
- //std::ifstream filestream(ui_layout_file.c_str());
-- boost::filesystem::ifstream filestream(ui_layout_file);
-+ boost::nowide::ifstream filestream(ui_layout_file);
- std::string full_line;
- while (std::getline(filestream, full_line)) {
- //remove spaces
-diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
-index 9bab91860..47568721a 100644
---- a/src/slic3r/Utils/Http.cpp
-+++ b/src/slic3r/Utils/Http.cpp
-@@ -11,6 +11,7 @@
- #include <boost/filesystem.hpp>
- #include <boost/format.hpp>
- #include <boost/log/trivial.hpp>
-+#include <boost/nowide/fstream.hpp>
-
- #include <curl/curl.h>
-
-@@ -52,7 +53,7 @@ namespace Slic3r {
- % error;
- })
- .on_complete([&](std::string body, unsigned /*
http_status */) {
-- boost::filesystem::fstream file(tmp_path,
std::ios::out | std::ios::binary | std::ios::trunc);
-+ boost::nowide::fstream file(tmp_path,
std::ios::out | std::ios::binary | std::ios::trunc);
- file.write(body.c_str(), body.size());
- file.close();
- boost::filesystem::rename(tmp_path,
target_path);
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch
deleted file mode 100644
index 6557d6653640..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 549d06f0d..bffb63d9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -496,6 +496,9 @@ endif ()
-
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+ add_library(cereal::cereal ALIAS cereal)
-+endif ()
-
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ec44417fa..9aae6dc11 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -141,7 +141,7 @@ if (NOT WIN32)
- set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
- endif ()
-
--target_link_libraries(Slic3r libslic3r cereal)
-+target_link_libraries(Slic3r libslic3r cereal::cereal)
- if (APPLE)
- # add_compile_options(-stdlib=libc++)
- # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO
-DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
-index c8f22a482..832149338 100644
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -399,7 +399,7 @@ target_include_directories(libslic3r PUBLIC
${EXPAT_INCLUDE_DIRS})
- target_link_libraries(libslic3r
- libnest2d
- admesh
-- cereal
-+ cereal::cereal
- libigl
- miniz
- boost_libs
-diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
-index f71b809b3..c64a2c5a9 100644
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE
$<$<BOOL:${SLIC3R_ALPHA}>:SLIC3
-
- encoding_check(libslic3r_gui)
-
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW
OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui
GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
-
- if (MSVC)
- target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
deleted file mode 100644
index 603a96ac67a5..000000000000
---
a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/src/angelscript/CMakeLists.txt b/src/angelscript/CMakeLists.txt
-index fed80a0ad..a65d9f8d5 100644
---- a/src/angelscript/CMakeLists.txt
-+++ b/src/angelscript/CMakeLists.txt
-@@ -202,48 +202,3 @@ endif()
-
- # Don't override the default runtime output path to avoid conflicts when
building for multiple target platforms
- #set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
--
--#See
https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages
for a detailed explanation about this part
--install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets
-- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-- INCLUDES DESTINATION include
--)
--
--install(FILES
-- ${CMAKE_CURRENT_SOURCE_DIR}/include/angelscript.h
-- DESTINATION include
-- COMPONENT Devel
--)
--
--include(CMakePackageConfigHelpers)
--write_basic_package_version_file(
-- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
-- VERSION ${PROJECT_VERSION}
-- COMPATIBILITY AnyNewerVersion
--)
--
--export(EXPORT AngelscriptTargets
-- FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake"
-- NAMESPACE Angelscript::
--)
--configure_file(cmake/AngelscriptConfig.cmake
-- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake"
-- COPYONLY
--)
--
--set(ConfigPackageLocation lib/cmake/Angelscript)
--install(EXPORT AngelscriptTargets
-- FILE AngelscriptTargets.cmake
-- NAMESPACE Angelscript::
-- DESTINATION ${ConfigPackageLocation}
--)
--install(
-- FILES
-- cmake/AngelscriptConfig.cmake
--
"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
-- DESTINATION ${ConfigPackageLocation}
-- COMPONENT Devel
--)
--
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
deleted file mode 100644
index 5a5c9960cc00..000000000000
---
a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9aae6dc11..75835903e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -299,5 +299,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/superslicer-2.5.59.0-missing-includes.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch
deleted file mode 100644
index 27f29fa9f6f1..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
-index 18dc7396e..95483e844 100644
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -1,6 +1,7 @@
- #include <boost/filesystem.hpp>
- #include "libslic3r/libslic3r.h"
- #include "libslic3r/Utils.hpp"
-+#include "libslic3r/I18N.hpp"
- #include "AppConfig.hpp"
- #include "Exception.hpp"
- #include "LocalesUtils.hpp"
-diff --git a/src/libslic3r/PerimeterGenerator.hpp
b/src/libslic3r/PerimeterGenerator.hpp
-index d7401f3fb..a95b7749d 100644
---- a/src/libslic3r/PerimeterGenerator.hpp
-+++ b/src/libslic3r/PerimeterGenerator.hpp
-@@ -1,6 +1,7 @@
- #ifndef slic3r_PerimeterGenerator_hpp_
- #define slic3r_PerimeterGenerator_hpp_
-
-+#include "ClipperUtils.hpp"
- #include "libslic3r.h"
- #include <vector>
- #include "ExPolygonCollection.hpp"
-diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-index be157eafa..d63eb110e 100644
---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-@@ -40,6 +40,7 @@
- #include <wx/odcombo.h>
- #include <wx/textctrl.h>
- #include <wx/wrapsizer.h>
-+#include <wx/rawbmp.h>
- #include "wxExtensions.hpp"
-
- #include <boost/filesystem/path.hpp>
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch
deleted file mode 100644
index 8ae71c13f4d3..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
-index 4fde5fa4a..566e73a5e 100644
---- a/cmake/modules/FindOpenVDB.cmake
-+++ b/cmake/modules/FindOpenVDB.cmake
-@@ -347,28 +347,10 @@ macro(just_fail msg)
- return()
- endmacro()
-
--find_package(IlmBase QUIET)
--if(NOT IlmBase_FOUND)
-- pkg_check_modules(IlmBase QUIET IlmBase)
--endif()
--if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
-- message(STATUS "Falling back to IlmBase found by pkg-config...")
--
-- find_library(IlmHalf_LIBRARY NAMES Half)
-- if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
-- just_fail("IlmBase::Half can not be found!")
-- endif()
--
-- add_library(IlmBase::Half UNKNOWN IMPORTED)
-- set_target_properties(IlmBase::Half PROPERTIES
-- IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
-- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
--elseif(NOT IlmBase_FOUND)
-- just_fail("IlmBase::Half can not be found!")
--endif()
- find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
- find_package(ZLIB ${_quiet} ${_required})
- find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
-+find_package(Imath CONFIG)
-
- # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
- # which we can query for optional deps. This basically runs ldd/otoll/objdump
-@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST})
- set(OpenVDB_USES_LOG4CPLUS ON)
- endif()
-
-- string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
-+ string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
- if(NOT ${_HAS_DEP} EQUAL -1)
- set(OpenVDB_USES_ILM ON)
- endif()
-@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
- find_package(Log4cplus ${_quiet} ${_required})
- endif()
-
--if(OpenVDB_USES_ILM)
-- find_package(IlmBase ${_quiet} ${_required})
--endif()
--
--if(OpenVDB_USES_EXR)
-+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
- find_package(OpenEXR ${_quiet} ${_required})
- endif()
-
-@@ -471,7 +449,7 @@ endif()
- set(_OPENVDB_VISIBLE_DEPENDENCIES
- Boost::iostreams
- Boost::system
-- IlmBase::Half
-+ Imath::Imath
- )
-
- set(_OPENVDB_DEFINITIONS)
-@@ -481,10 +459,7 @@ endif()
-
- if(OpenVDB_USES_EXR)
- list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
-- IlmBase::IlmThread
-- IlmBase::Iex
-- IlmBase::Imath
-- OpenEXR::IlmImf
-+ OpenEXR::OpenEXR
- )
- list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
- endif()
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch
deleted file mode 100644
index abe4d7bf60cc..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
-index ccd3cc083..be8bbe5cd 100644
---- a/src/slic3r/GUI/GUI.cpp
-+++ b/src/slic3r/GUI/GUI.cpp
-@@ -33,6 +33,16 @@ class AppConfig;
-
- namespace GUI {
-
-+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
-+#ifdef __WXGTK3__
-+struct ForceX11 {
-+ ForceX11() {
-+ setenv("GDK_BACKEND", "x11", 1);
-+ }
-+};
-+static struct ForceX11 forcex11;
-+#endif
-+
- #if __APPLE__
- IOPMAssertionID assertionID;
- #endif
diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
deleted file mode 100644
index 7cdeaa9cc284..000000000000
--- a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="SuperSlicer"
-SLICER_PROFILES_COMMIT="748fbdfd2ac077e4e415868e7bc963740b92aa8e"
-
-inherit cmake wxwidgets xdg flag-o-matic
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication
(3D printers)"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer/";
-SRC_URI="
-
https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
-
https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz
-> ${P}-profiles.tar.gz
-"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-# No dep on sci-libs/libigl, in-tree version cannot build
-# static library currently. Using bundled one.
-RDEPEND="
- dev-cpp/eigen:3
- dev-cpp/tbb:=
- dev-libs/boost:=[nls]
- dev-libs/cereal
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/gmp:=
- dev-libs/mpfr:=
- dev-libs/imath:=
- >=media-gfx/openvdb-8.2:=
- net-misc/curl[adns]
- media-libs/glew:0=
- media-libs/libpng:0=
- media-libs/qhull:=
- sci-libs/nlopt
- >=sci-mathematics/cgal-5.0:=
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/glu
- virtual/opengl
- x11-libs/gtk+:3
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
- media-libs/qhull[static-libs]
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-openexr3.patch"
- "${FILESDIR}/${P}-wxgtk3-wayland.patch"
- "${FILESDIR}/${P}-cereal.patch"
- "${FILESDIR}/${P}-boost.patch"
- "${FILESDIR}/${P}-boost-1.81-std-wxString-to-std-wstring.patch"
- "${FILESDIR}/${P}-missing-includes.patch"
- "${FILESDIR}/${P}-dont-install-bundled-angelscript.patch"
- "${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
- default
-
- mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE="Release"
-
- append-flags -fno-strict-aliasing
-
- setup-wxwidgets
-
- local mycmakeargs=(
- -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
- -DSLIC3R_BUILD_TESTS=$(usex test)
- -DSLIC3R_FHS=ON
- -DSLIC3R_GTK=3
- -DSLIC3R_GUI=ON
- -DSLIC3R_PCH=OFF
- -DSLIC3R_STATIC=OFF
- -DSLIC3R_WX_STABLE=ON
- -Wno-dev
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
-}
