Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package PrusaSlicer for openSUSE:Factory checked in at 2022-08-02 22:08:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PrusaSlicer (Old) and /work/SRC/openSUSE:Factory/.PrusaSlicer.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PrusaSlicer" Tue Aug 2 22:08:47 2022 rev:22 rq:992064 version:2.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/PrusaSlicer/PrusaSlicer.changes 2022-06-01 17:35:06.554772508 +0200 +++ /work/SRC/openSUSE:Factory/.PrusaSlicer.new.1533/PrusaSlicer.changes 2022-08-02 22:09:20.309797839 +0200 @@ -1,0 +2,5 @@ +Mon Aug 1 15:42:40 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Add PrusaSlicer-cereal.patch -- gh#prusa3d/PrusaSlicer#7809 + +------------------------------------------------------------------- New: ---- PrusaSlicer-cereal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PrusaSlicer.spec ++++++ --- /var/tmp/diff_new_pack.DsUaNq/_old 2022-08-02 22:09:20.953799696 +0200 +++ /var/tmp/diff_new_pack.DsUaNq/_new 2022-08-02 22:09:20.961799719 +0200 @@ -26,6 +26,8 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM PrusaSlicer-boost1.79.patch -- gh#prusa3d/PrusaSlicer#8238 Patch0: PrusaSlicer-boost1.79.patch +# PATCH-FIX-UPSTREAM PrusaSlicer-cereal.patch -- gh#prusa3d/PrusaSlicer#7809 +Patch1: PrusaSlicer-cereal.patch BuildRequires: blosc-devel BuildRequires: cereal-devel BuildRequires: cgal-devel >= 4.13.2 ++++++ PrusaSlicer-cereal.patch ++++++ >From 0ffcfd8393457fd035576436752267c9a1e6bbcc Mon Sep 17 00:00:00 2001 From: Yuri D'Elia <wav...@thregr.org> Date: Mon, 24 Jan 2022 20:21:24 +0100 Subject: [PATCH] Use namespaces to link against libcereal >= 1.3.1 Create an alias for previous versions. --- CMakeLists.txt | 3 +++ src/CMakeLists.txt | 2 +- src/libslic3r/CMakeLists.txt | 2 +- src/slic3r/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) Index: PrusaSlicer-version_2.4.2/CMakeLists.txt =================================================================== --- PrusaSlicer-version_2.4.2.orig/CMakeLists.txt +++ PrusaSlicer-version_2.4.2/CMakeLists.txt @@ -474,6 +474,12 @@ endif () # 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") Index: PrusaSlicer-version_2.4.2/src/CMakeLists.txt =================================================================== --- PrusaSlicer-version_2.4.2.orig/src/CMakeLists.txt +++ PrusaSlicer-version_2.4.2/src/CMakeLists.txt @@ -125,7 +125,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 libcereal) if (APPLE) # add_compile_options(-stdlib=libc++) # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) Index: PrusaSlicer-version_2.4.2/src/libslic3r/CMakeLists.txt =================================================================== --- PrusaSlicer-version_2.4.2.orig/src/libslic3r/CMakeLists.txt +++ PrusaSlicer-version_2.4.2/src/libslic3r/CMakeLists.txt @@ -337,7 +337,7 @@ target_include_directories(libslic3r PUB target_link_libraries(libslic3r libnest2d admesh - cereal + libcereal libigl miniz boost_libs Index: PrusaSlicer-version_2.4.2/src/slic3r/CMakeLists.txt =================================================================== --- PrusaSlicer-version_2.4.2.orig/src/slic3r/CMakeLists.txt +++ PrusaSlicer-version_2.4.2/src/slic3r/CMakeLists.txt @@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3 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)
