From 20b3bfce580e0a9752397024a14dfd8d0aecb701 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Sun, 24 Nov 2024 19:14:47 -0500 Subject: [PATCH] PrusaSlicer: remove package. Unusable, immediately SIGSEGV. Unpackageable, depends on a spaghetti mess of vendored dependencies and dependencies downloaded by cmake at build time. Considering that the package straight up does not work, I doubt that anyone will be affected by this. Available as a flatpak, so there's an easy alternative. --- srcpkgs/PrusaSlicer/files/README.voidlinux | 4 - ...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------ ...ace-get_current_thread_name-for-musl.patch | 30 ------- .../patches/ambiguous-overloads.patch | 28 ------ srcpkgs/PrusaSlicer/patches/boost-1.81.patch | 15 ---- .../patches/cereal-is-header-only.patch | 38 --------- .../patches/cmake-is-very-good.patch | 25 ------ .../patches/cmake-relax-dependency.patch | 11 --- srcpkgs/PrusaSlicer/patches/cstdint.patch | 85 ------------------- srcpkgs/PrusaSlicer/patches/fstream.patch | 57 ------------- .../patches/prusa-slicer-openexr3.patch | 76 ----------------- srcpkgs/PrusaSlicer/template | 52 ------------ srcpkgs/Slic3rPE | 1 - srcpkgs/removed-packages/template | 4 +- 14 files changed, 3 insertions(+), 448 deletions(-) delete mode 100644 srcpkgs/PrusaSlicer/files/README.voidlinux delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/boost-1.81.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/cstdint.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch delete mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch delete mode 100644 srcpkgs/PrusaSlicer/template delete mode 120000 srcpkgs/Slic3rPE diff --git a/srcpkgs/PrusaSlicer/files/README.voidlinux b/srcpkgs/PrusaSlicer/files/README.voidlinux deleted file mode 100644 index 190965371f6..00000000000 --- a/srcpkgs/PrusaSlicer/files/README.voidlinux +++ /dev/null @@ -1,4 +0,0 @@ -Slic3rPE has been renamed to PrusaSlicer - -The binary executable has been renamed from -/usr/bin/slic3r-pe to /usr/bin/prusa-slicer diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch deleted file mode 100644 index c759e84879a..00000000000 --- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001 -From: Jasper Chan -Date: Mon, 27 May 2019 18:54:59 -0700 -Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl - ---- - src/slic3r/Utils/Serial.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp -index 601719b50..43dab2390 100644 ---- a/src/slic3r/Utils/Serial.cpp -+++ b/src/slic3r/Utils/Serial.cpp -@@ -42,7 +42,7 @@ - #ifndef _WIN32 - #include - #include -- #include -+ #include - #include - #endif - --- -2.21.0 - diff --git a/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch deleted file mode 100644 index 1dca187b2ba..00000000000 --- a/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/libslic3r/Thread.cpp 2021-01-24 13:50:00.469444149 +0100 -+++ b/src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100 -@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre - return true; - } - -+#ifndef __GLIBC__ -+thread_local char current_thread_name[16] = { 0 }; -+#endif -+ - bool set_current_thread_name(const char *thread_name) - { -+#ifndef __GLIBC__ -+ strncpy(current_thread_name, thread_name, 15); -+#endif - pthread_setname_np(pthread_self(), thread_name); - return true; - } - - std::optional get_current_thread_name() - { -+#ifdef __GLIBC__ - char buf[16]; - return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : ""); -+#else -+ return std::string(current_thread_name); -+#endif - } - - #endif diff --git a/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch deleted file mode 100644 index eb8cd200a0b..00000000000 --- a/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp -index 2364c5624..c977bee4c 100644 ---- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp -+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp -@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr - // Always fill in the "printhost_port" combo box from the config and select it. - { - Choice* choice = dynamic_cast(m_optgroup->get_field("printhost_port")); -- choice->set_values({ m_config->opt_string("printhost_port") }); -+ const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") }; -+ choice->set_values(printhost_port); - choice->set_selection(); - } - -diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp -index 2d00674c0..011ef7cfd 100644 ---- a/src/slic3r/GUI/Plater.cpp -+++ b/src/slic3r/GUI/Plater.cpp -@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename) - - p->reset(); - -- if (! load_files({ into_path(filename) }).empty()) { -+ boost::filesystem::path full_path = into_path(filename); -+ if (! load_files({ full_path }, true, true).empty()) { - // At least one file was loaded. - p->set_project_filename(filename); - // Save the names of active presets and project specific config into ProjectDirtyStateManager. diff --git a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch deleted file mode 100644 index d320a3bfd66..00000000000 --- a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp -=================================================================== ---- PrusaSlicer-2.4.2.orig/src/slic3r/GUI/PrintHostDialogs.cpp -+++ PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp -@@ -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 wxString &apath) -> bool { -+ if (! apath.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; diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch deleted file mode 100644 index 24897e503ef..00000000000 --- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt -=================================================================== ---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt -+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt -@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB - target_link_libraries(libslic3r - libnest2d - admesh -- cereal - libigl - miniz - boost_libs -Index: PrusaSlicer-2.4.2/src/CMakeLists.txt -=================================================================== ---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt -+++ PrusaSlicer-2.4.2/src/CMakeLists.txt -@@ -125,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE) - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") - endif () - --target_link_libraries(PrusaSlicer libslic3r cereal) -+target_link_libraries(PrusaSlicer libslic3r) - - if (APPLE) - # add_compile_options(-stdlib=libc++) -Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt -=================================================================== ---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt -+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt -@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3 - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch b/srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch deleted file mode 100644 index f2ca8e0c1f7..00000000000 --- a/srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch +++ /dev/null @@ -1,25 +0,0 @@ -get_prerequisites will go straight to run ldd on the libraries. - -get_prerequisites supports objdump, but only on Windows ---- a/cmake/modules/FindOpenVDB.cmake -+++ b/cmake/modules/FindOpenVDB.cmake -@@ -381,19 +381,6 @@ set(_EXCLUDE_SYSTEM_PREREQUISITES 1) - set(_RECURSE_PREREQUISITES 0) - set(_OPENVDB_PREREQUISITE_LIST) - --if(NOT OPENVDB_USE_STATIC_LIBS) --get_prerequisites(${OpenVDB_openvdb_LIBRARY} -- _OPENVDB_PREREQUISITE_LIST -- ${_EXCLUDE_SYSTEM_PREREQUISITES} -- ${_RECURSE_PREREQUISITES} -- "" -- "${SYSTEM_LIBRARY_PATHS}" --) --endif() -- --unset(_EXCLUDE_SYSTEM_PREREQUISITES) --unset(_RECURSE_PREREQUISITES) -- - # As the way we resolve optional libraries relies on library file names, use - # the configuration options from the main CMakeLists.txt to allow users - # to manually identify the requirements of OpenVDB builds if they know them. diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch deleted file mode 100644 index b0f1448779a..00000000000 --- a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200 -+++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200 -@@ -19,7 +19,7 @@ include(GenerateExportHeader) - - generate_export_header(OCCTWrapper) - --find_package(OpenCASCADE 7.6.2 REQUIRED) -+find_package(OpenCASCADE REQUIRED) - - set(OCCT_LIBS - TKXDESTEP diff --git a/srcpkgs/PrusaSlicer/patches/cstdint.patch b/srcpkgs/PrusaSlicer/patches/cstdint.patch deleted file mode 100644 index 3b74f98a578..00000000000 --- a/srcpkgs/PrusaSlicer/patches/cstdint.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001 -From: Robert Schiele -Date: Fri, 5 May 2023 20:39:46 +0200 -Subject: [PATCH] add missing includes of (PR #10499) - ---- - deps/OpenEXR/OpenEXR.cmake | 3 ++- - deps/OpenEXR/OpenEXR.patch | 36 +++++++++++++++++++++++++++++++++ - src/libslic3r/PNGReadWrite.hpp | 1 + - 4 files changed, 40 insertions(+), 1 deletion(-) - create mode 100644 deps/OpenEXR/OpenEXR.patch - -diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake -index 046223fed9e..094965d0421 100644 ---- a/deps/OpenEXR/OpenEXR.cmake -+++ b/deps/OpenEXR/OpenEXR.cmake -@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR - URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de - DEPENDS ${ZLIB_PKG} - GIT_TAG v2.5.5 -+ PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch - CMAKE_ARGS - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - -DBUILD_TESTING=OFF -@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR - - if (MSVC) - add_debug_dep(dep_OpenEXR) --endif () -\ No newline at end of file -+endif () -diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch -new file mode 100644 -index 00000000000..22adbd27784 ---- /dev/null -+++ b/deps/OpenEXR/OpenEXR.patch -@@ -0,0 +1,36 @@ -+diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp -+index 59d1d5d1..585a3e65 100644 -+--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp -++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp -+@@ -159,6 +159,7 @@ -+ #include -+ -+ #include -++#include -+ -+ -+ // Windows specific addition to prevent the indirect import of the redefined min/max macros -+diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp -+index 271849b7..165fac58 100644 -+--- a/OpenEXR/IlmImf/ImfHuf.cpp -++++ b/OpenEXR/IlmImf/ImfHuf.cpp -+@@ -53,6 +53,7 @@ -+ #include -+ #include -+ #include -++#include -+ -+ -+ using namespace std; -+diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp -+index d2c84787..4b487940 100644 -+--- a/OpenEXR/IlmImf/ImfMisc.cpp -++++ b/OpenEXR/IlmImf/ImfMisc.cpp -+@@ -40,6 +40,7 @@ -+ // -+ //----------------------------------------------------------------------------- -+ -++#include -+ #include -+ #include -+ #include -diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp -index 01e1f474500..399c6224382 100644 ---- a/src/libslic3r/PNGReadWrite.hpp -+++ b/src/libslic3r/PNGReadWrite.hpp -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - namespace Slic3r { namespace png { - diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch deleted file mode 100644 index c40928e84bd..00000000000 --- a/srcpkgs/PrusaSlicer/patches/fstream.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/tests/fff_print/test_data.cpp -+++ b/tests/fff_print/test_data.cpp -@@ -8,6 +8,7 @@ - #include "libslic3r/Format/STL.hpp" - - #include -+#include - #include - - #include ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include - #include - #include ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -10,6 +10,7 @@ - #include "libslic3r/Platform.hpp" - #include "libslic3r/Config.hpp" - -+#include - #include - #include - #include -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch deleted file mode 100644 index 9caf47f640c..00000000000 --- a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake ---- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 2021-12-21 15:57:35.000000000 +0000 -+++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake 2022-02-11 19:27:12.105404186 +0000 -@@ -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_PREREQUI - 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/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template deleted file mode 100644 index 88c6777af29..00000000000 --- a/srcpkgs/PrusaSlicer/template +++ /dev/null @@ -1,52 +0,0 @@ -# Template file for 'PrusaSlicer' -pkgname=PrusaSlicer -version=2.5.2 -revision=5 -build_style=cmake -build_helper="qemu cmake-wxWidgets-gtk3" -# Pre-Compiled Headers seems to be slower -configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3 - -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF" -hostmakedepends="pkg-config" -makedepends="boost-devel cereal cgal-devel dbus-devel eigen glew-devel - glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel - libpng-devel nlopt-devel openvdb-devel tbb-devel mpfr-devel c-blosc-devel - libopenexr-devel wxWidgets-gtk3-devel occt-devel" -short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="https://www.prusa3d.com/prusaslicer/" -distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" -checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b - -CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - -if [ -z "${XBPS_CHECK_PKGS}" ]; then - configure_args+=" -DSLIC3R_BUILD_TESTS=OFF" -fi - -post_extract() { - # Mark tests that fail on certain targets - case "$XBPS_TARGET_MACHINE" in - *-musl) - vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \ - -e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/' - ;; - i686*) - vsed -i tests/libslic3r/test_voronoi.cpp \ - -e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/' - vsed -i tests/fff_print/test_trianglemesh.cpp \ - -e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/' - ;; - esac - # rm -rf src/boost -} - -Slic3rPE_package() { - build_style=meta - short_desc+=" (transitional dummy package)" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vdoc ${FILESDIR}/README.voidlinux - } -} diff --git a/srcpkgs/Slic3rPE b/srcpkgs/Slic3rPE deleted file mode 120000 index f9b60034c37..00000000000 --- a/srcpkgs/Slic3rPE +++ /dev/null @@ -1 +0,0 @@ -PrusaSlicer \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9318da10ce1..86dd2ab6932 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20241122 +version=0.1.20241124 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -21,8 +21,10 @@ replaces=" MultiMC<=0.6.13_1 Platinum9-theme<=0.0.0.20170720_3 PolyMC<=7.2_1 + PrusaSlicer<=2.5.2_5 Pyrex<=0.9.9_5 SMC<=1.9_9 + Slic3rPE<=2.5.2_5 Twisted<=17.9.0_2 Venom<=0.5.5_1 XorCurses<=0.2.2_1