diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2023-02-08 17:54:43 +0100 |
|---|---|---|
| committer |   Alfredo Tupone <tupone@gentoo.org> | 2023-02-23 22:03:30 +0100 |
| commit | 5b93b811ad529bf91091e94bfe160cbad5a779a7 (patch) | |
| tree | 6c7a42365fa558d0b78240ab8e76330384aecdc5 /media-gfx/prusaslicer | |
| parent | dev-qt/qtwebengine: remove unused patch (diff) | |
| download | gentoo-5b93b811ad529bf91091e94bfe160cbad5a779a7.tar.gz gentoo-5b93b811ad529bf91091e94bfe160cbad5a779a7.tar.bz2 gentoo-5b93b811ad529bf91091e94bfe160cbad5a779a7.zip | |
media-gfx/prusaslicer: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29494
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Diffstat (limited to 'media-gfx/prusaslicer')
| -rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch deleted file mode 100644 index d57eb8a31728..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/834005 -https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -506,6 +506,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") ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -126,7 +126,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 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) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -358,7 +358,7 @@ find_package(JPEG REQUIRED) - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ cereal::cereal - libigl - miniz - boost_libs ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -270,7 +270,7 @@ endforeach() - - 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 cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) |