diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-01 19:24:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-01 19:24:10 +0100 |
| commit | b052fbf151106a4f47cac7fdf0ffff983decb773 (patch) | |
| tree | 5d21279a4eeaf4076caee87654b610a0fe8a4051 /media-gfx/prusaslicer/files | |
| parent | c3b55a6be7da027d97d8aef00ef88c3011121a42 (diff) | |
gentoo auto-resync : 01:09:2022 - 19:24:10
Diffstat (limited to 'media-gfx/prusaslicer/files')
| -rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch | 22 | ||||
| -rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch | 14 |
2 files changed, 25 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 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch new file mode 100644 index 000000000000..c86c585926ab --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch @@ -0,0 +1,14 @@ +--- a/tests/fff_print/test_data.cpp ++++ b/tests/fff_print/test_data.cpp +@@ -4,10 +4,9 @@ + #include "libslic3r/GCodeReader.hpp" + #include "libslic3r/Config.hpp" + #include "libslic3r/Print.hpp" +-#include "libslic3r/Format/OBJ.hpp" +-#include "libslic3r/Format/STL.hpp" + + #include <cstdlib> ++#include <fstream> + #include <string> + + #include <boost/nowide/cstdio.hpp> |