From 4edf8674c574dce6e75482fef65d5277e1288804 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: May 16 2021 04:26:47 +0000
Subject: update to 2.3.1

include upstream patch fixing build with gcc 11

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch b/0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch
new file mode 100644
index 0000000..b0164f4
--- /dev/null
+++ b/0001-Fix-build-error-with-non-const-MINSIGSTKSZ.patch
@@ -0,0 +1,29 @@
+From 581fef448d1afb1dc89199848dcccaee2e8a5c89 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+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 <dennis@ausil.us>
+---
+ 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/prusa-slicer.spec b/prusa-slicer.spec
index 2e32010..8e2cb0f 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -29,6 +29,10 @@ Source2:        %name.appdata.xml
 # https://github.com/prusa3d/PrusaSlicer/commit/62592cab48cfb6a20d84041b1992aecc6a2b659c
 Patch1:         optional.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
+
 # Highly-parallel uild can run out of memory on PPC64le
 %ifarch ppc64le
 %global _smp_ncpus_max 8
@@ -382,6 +386,10 @@ 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
@@ -394,13 +402,17 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed '
 %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
-%_datadir/PrusaSlicer/{icons,models,profiles,shaders,udev}/
-
+%if 0%{?flatpak}
+%_datadir/PrusaSlicer/{icons,models,profiles,shaders,udev,applications}/
+%else
+%_datadir/PrusaSlicer/{icons,models,profiles,shaders,udev,applications,data}/
+%endif
 
 %changelog
 * Sat May 15 2021 Dennis Gilmore <dennis@ausil.us> - 2.3.1-1