diff --git a/0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch b/0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch deleted file mode 100644 index b0164f4..0000000 --- a/0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 581fef448d1afb1dc89199848dcccaee2e8a5c89 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Sat, 15 May 2021 22:04:55 -0500 -Subject: [PATCH] Fix build error with non-const MINSIGSTKSZ. - -see https://github.com/catchorg/Catch2/issues/2178 - -Signed-off-by: Dennis Gilmore ---- - tests/catch2/catch.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/catch2/catch.hpp b/tests/catch2/catch.hpp -index 282d1562c..a8c71c864 100644 ---- a/tests/catch2/catch.hpp -+++ b/tests/catch2/catch.hpp -@@ -10819,7 +10819,8 @@ namespace Catch { - - // 32kb for the alternate stack seems to be sufficient. However, this value - // is experimentally determined, so that's not guaranteed. -- static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ; -+ // Update: MINSIGSTKSZ is not const anymore with recent glibc -+ static constexpr std::size_t sigStackSize = 32768; - - static SignalDefs signalDefs[] = { - { SIGINT, "SIGINT - Terminal interrupt signal" }, --- -2.31.1 - diff --git a/atomic.patch b/atomic.patch new file mode 100644 index 0000000..734aca8 --- /dev/null +++ b/atomic.patch @@ -0,0 +1,25 @@ +From 19d28524e76ff9c5b7fa4ff1a8373bfbacad9775 Mon Sep 17 00:00:00 2001 +From: Yuri D'Elia +Date: Sun, 13 Dec 2020 19:41:47 +0100 +Subject: [PATCH] Include for std::atomic where needed + +Fixes build on linux using clang 11 +--- + src/slic3r/GUI/Mouse3DController.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp +index eb1425b..4e0c8e6 100644 +--- a/src/slic3r/GUI/Mouse3DController.hpp ++++ b/src/slic3r/GUI/Mouse3DController.hpp +@@ -8,6 +8,7 @@ + + #include "hidapi.h" + ++#include + #include + #include + #include +-- +2.30.0 + diff --git a/endian.patch b/endian.patch new file mode 100644 index 0000000..c970c77 --- /dev/null +++ b/endian.patch @@ -0,0 +1,50 @@ +diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp +index 390fe56..7ac2704 100644 +--- a/src/admesh/stlinit.cpp ++++ b/src/admesh/stlinit.cpp +@@ -28,7 +28,6 @@ + + #include + #include +-#include + + #include "stl.h" + +@@ -36,9 +35,9 @@ + #error "SEEK_SET not defined" + #endif + +-#ifndef BOOST_LITTLE_ENDIAN ++#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ + extern void stl_internal_reverse_quads(char *buf, size_t cnt); +-#endif /* BOOST_LITTLE_ENDIAN */ ++#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ + + static FILE* stl_open_count_facets(stl_file *stl, const char *file) + { +@@ -89,10 +88,10 @@ static FILE* stl_open_count_facets(stl_file *stl, const char *file) + // Read the int following the header. This should contain # of facets. + uint32_t header_num_facets; + bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0; +-#ifndef BOOST_LITTLE_ENDIAN ++#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ + // Convert from little endian to big endian. + stl_internal_reverse_quads((char*)&header_num_facets, 4); +-#endif /* BOOST_LITTLE_ENDIAN */ ++#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ + if (! header_num_faces_read || num_facets != header_num_facets) + BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file; + } +@@ -158,10 +157,10 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first) + // Read a single facet from a binary .STL file. We assume little-endian architecture! + if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET) + return false; +-#ifndef BOOST_LITTLE_ENDIAN ++#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ + // Convert the loaded little endian data to big endian. + stl_internal_reverse_quads((char*)&facet, 48); +-#endif /* BOOST_LITTLE_ENDIAN */ ++#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ + } else { + // Read a single facet from an ASCII .STL file + // skip solid/endsolid diff --git a/optional.patch b/optional.patch deleted file mode 100644 index bbe4f65..0000000 --- a/optional.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 62592cab48cfb6a20d84041b1992aecc6a2b659c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= -Date: Sat, 1 May 2021 22:33:59 +0200 -Subject: [PATCH] Added missing include (GCC 11.1) - ---- - src/libslic3r/Optimize/Optimizer.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp -index 05191eba26..8ae55c61c5 100644 ---- a/src/libslic3r/Optimize/Optimizer.hpp -+++ b/src/libslic3r/Optimize/Optimizer.hpp -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - namespace Slic3r { namespace opt { - diff --git a/prusa-slicer.spec b/prusa-slicer.spec index f3ff524..165acf4 100644 --- a/prusa-slicer.spec +++ b/prusa-slicer.spec @@ -7,8 +7,8 @@ %endif Name: prusa-slicer -Version: 2.3.1 -Release: 1%{?dist}.1 +Version: 2.2.0 +Release: 11%{?dist} Summary: 3D printing slicer optimized for Prusa printers # The main PrusaSlicer code and resources are AGPLv3, with small parts as @@ -25,13 +25,16 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version. Source1: %name.desktop Source2: %name.appdata.xml -# Added missing include (GCC 11.1) -# https://github.com/prusa3d/PrusaSlicer/commit/62592cab48cfb6a20d84041b1992aecc6a2b659c -Patch1: optional.patch +# Boost 1.73 support +# https://bugzilla.redhat.com/show_bug.cgi?id=1842011 +# https://github.com/prusa3d/PrusaSlicer/issues/4264 +# https://github.com/prusa3d/PrusaSlicer/pull/4340 +Patch1: endian.patch -# Fix build error with non-const MINSIGSTKSZ -# https://github.com/prusa3d/PrusaSlicer/pull/6518 -Patch2: 0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch +# Include for std::atomic where needed +# Fixes build with Boost 1.75 +# https://github.com/prusa3d/PrusaSlicer/commit/44f71f0ed1 +Patch2: atomic.patch # Highly-parallel uild can run out of memory on PPC64le %ifarch ppc64le @@ -386,10 +389,6 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed ' s:\(.*\):%dir \1: ' >> lang-files -# remove the flatpak data on non flatpak builds -%if 0%{?flatpak} -rm -rf %buildroot%_datadir/PrusaSlicer/data/ -%endif %check # Some tests are Perl but there is a framework for other tests even though @@ -402,29 +401,15 @@ rm -rf %buildroot%_datadir/PrusaSlicer/data/ %license LICENSE %doc README.md %_bindir/%name -%_bindir/prusa-gcodeviewer %_bindir/%name.wrapped %_datadir/icons/hicolor/*/apps/%name.png %_datadir/applications/%name.desktop %_datadir/appdata/%name.appdata.xml %dir %_datadir/PrusaSlicer -%if 0%{?flatpak} -%_datadir/PrusaSlicer/{icons,models,profiles,shaders,udev,applications}/ -%else -%_datadir/PrusaSlicer/{icons,models,profiles,shaders,udev,applications,data}/ -%endif +%_datadir/PrusaSlicer/{icons,models,profiles,shaders,udev}/ + %changelog -* Sun Nov 28 2021 Mamoru TASAKA - 2.3.1-1.1 -- Rebuild for openvdb 9 - -* Sat May 15 2021 Dennis Gilmore - 2.3.1-1 -- update to 2.3.1 -- include upstream patch fixing build with gcc 11 - -* Mon May 10 2021 Jonathan Wakely - 2.2.0-12 -- Rebuilt for removed libstdc++ symbols (#1937698) - * Wed Jan 27 2021 Fedora Release Engineering - 2.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 252cb0f..0785c03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (version_2.3.1.tar.gz) = 2722ee9d5331fe03423ce179cec68196320b48c65bd3c6795b93469268956fb309609462cc62bf3e2b4f30d2fe720d0a28a16c010993737c045d82956493a1e3 +SHA512 (version_2.2.0.tar.gz) = 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d