From 9aabedae7023407729b9328b8303c191bcbd1330 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Jan 28 2024 07:14:53 +0000 Subject: The libcereal is an interface target and should pass. --- diff --git a/prusa-slicer-no-cereal-lib.patch b/prusa-slicer-no-cereal-lib.patch deleted file mode 100644 index c15c8ae..0000000 --- a/prusa-slicer-no-cereal-lib.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up PrusaSlicer-version_2.6.0/src/libslic3r/CMakeLists.txt.no-cereal-lib PrusaSlicer-version_6.4.0/src/libslic3r/CMakeLists.txt ---- PrusaSlicer-version_6.4.0/src/libslic3r/CMakeLists.txt.no-cereal-lib 2022-02-11 20:07:36.399806933 +0000 -+++ PrusaSlicer-version_6.4.0/src/libslic3r/CMakeLists.txt 2022-02-11 20:14:53.806895641 +0000 -@@ -490,7 +490,6 @@ - target_link_libraries(libslic3r - libnest2d - admesh -- libcereal - libigl - miniz - boost_libs -diff -up PrusaSlicer-version_2.6.0/src/CMakeLists.txt.no-cereal-lib PrusaSlicer-version_2.6.0/src/CMakeLists.txt ---- PrusaSlicer-version_2.6.0/src/CMakeLists.txt.no-cereal-lib 2022-02-11 20:31:04.581810442 +0000 -+++ PrusaSlicer-version_2.6.0/src/CMakeLists.txt 2022-02-11 20:31:15.726430666 +0000 -@@ -147,7 +147,7 @@ - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") - endif () - --target_link_libraries(PrusaSlicer libslic3r libcereal) -+target_link_libraries(PrusaSlicer libslic3r) - - if (APPLE) - # add_compile_options(-stdlib=libc++) -diff -up PrusaSlicer-version_2.6.0/src/slic3r/CMakeLists.txt.no-cereal-lib PrusaSlicer-version_2.6.0/src/slic3r/CMakeLists.txt ---- PrusaSlicer-version_2.6.0/src/slic3r/CMakeLists.txt.no-cereal-lib 2022-02-11 20:30:36.653762157 +0000 -+++ PrusaSlicer-version_2.6.0/src/slic3r/CMakeLists.txt 2022-02-11 20:30:47.604388990 +0000 -@@ -319,7 +319,7 @@ - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast) -+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/prusa-slicer.spec b/prusa-slicer.spec index f007ed2..b668917 100644 --- a/prusa-slicer.spec +++ b/prusa-slicer.spec @@ -8,7 +8,7 @@ Name: prusa-slicer Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D printing slicer optimized for Prusa printers # The main PrusaSlicer code and resources are AGPLv3, with small parts as @@ -24,8 +24,6 @@ URL: https://github.com/prusa3d/PrusaSlicer/ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.tar.gz Source2: %name.appdata.xml -Patch1: prusa-slicer-no-cereal-lib.patch - # Fix compilation errors with -std=gnu++17 (PR#11154) Patch3: prusa-slicer-fix-gcc-17.patch @@ -392,6 +390,9 @@ desktop-file-validate %buildroot%_datadir/applications/PrusaGcodeviewer.desktop %endif %changelog +* Sun Jan 28 2024 Jan Pazdziora - 2.6.0-2 +- Update how the cereal component is built, patch is no longer needed. + * Sun Jan 28 2024 Jan Pazdziora - 2.6.0-1 - Rebase to 2.6.0.