diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2023-04-22 12:24:32 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2023-04-22 12:57:03 +0200 |
| commit | 5569971659ff988c27ea868756e7da935f42dea5 (patch) | |
| tree | f7d58e9194623ed6cd8c5169a8a50c6d4092cdff /gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch | |
| parent | 6c91f65d09debbb8578047e4b5669b8ba4c73888 (diff) | |
gnu: prusa-slicer: Update to 2.5.2.
* gnu/packages/patches/prusa-slicer-boost-fixes.patch: New file.
* gnu/packages/patches/prusa-slicer-fix-tests.patch: New file.
* gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register them.
* gnu/packages/engineering.scm (prusa-slicer): Update to 2.5.2.
[source]: Use patches.
[inputs]: Replace cereal-1.3.0 by cereal.
Diffstat (limited to 'gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch')
| -rw-r--r-- | gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch new file mode 100644 index 0000000000..affa506b1c --- /dev/null +++ b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch @@ -0,0 +1,52 @@ +Fix for building with cereal>=1.3.1. +This patch comes from Gentoo: + portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -127,7 +127,7 @@ + set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") + endif () + +-target_link_libraries(PrusaSlicer libslic3r cereal) ++target_link_libraries(PrusaSlicer libslic3r libcereal) + + if (APPLE) + # add_compile_options(-stdlib=libc++) +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -260,7 +260,7 @@ + + 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 libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) + + if (MSVC) + target_link_libraries(libslic3r_gui Setupapi.lib) +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -395,7 +395,7 @@ + target_link_libraries(libslic3r + libnest2d + admesh +- cereal ++ libcereal + libigl + miniz + boost_libs +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -446,6 +446,12 @@ + + # Find the Cereal serialization library + find_package(cereal REQUIRED) ++add_library(libcereal INTERFACE) ++if (NOT TARGET cereal::cereal) ++ target_link_libraries(libcereal INTERFACE cereal) ++else() ++ target_link_libraries(libcereal INTERFACE cereal::cereal) ++endif() + + # l10n + set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") |