summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Lamm <expeditioneer@gentoo.org>2022-08-30 07:38:05 +0200
committerDennis Lamm <expeditioneer@gentoo.org>2022-08-31 20:26:46 +0200
commit5c5e7975edee5370b7bab429e495c69fe5fbb222 (patch)
tree6cb566e8f719120c66a3994536553cc77ff25ca7 /media-gfx
parentdev-python/jsonschema: Keyword 4.15.0 x86, #865739 (diff)
downloadgentoo-5c5e7975edee5370b7bab429e495c69fe5fbb222.tar.gz
gentoo-5c5e7975edee5370b7bab429e495c69fe5fbb222.tar.bz2
gentoo-5c5e7975edee5370b7bab429e495c69fe5fbb222.zip
media-gfx/prusaslicer: fixed for cereal <1.3.1
Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org> Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
index 29e01422b41f..056c6150a7b0 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
@@ -1,38 +1,38 @@
---- a/src/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/CMakeLists.txt (date 1661704655632)
+--- 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 cereal::cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
if (APPLE)
# add_compile_options(-stdlib=libc++)
---- a/src/slic3r/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/slic3r/CMakeLists.txt (date 1661704724566)
+--- 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 cereal::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 (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/libslic3r/CMakeLists.txt (date 1661704699199)
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
@@ -395,7 +395,7 @@
target_link_libraries(libslic3r
libnest2d
admesh
- cereal
-+ cereal::cereal
++ libcereal
libigl
miniz
boost_libs
---- a/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/CMakeLists.txt (date 1661704556468)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -446,6 +446,12 @@
# Find the Cereal serialization library