From 0648ea45b5dbe8efa8e8a703a59b87e8d36acc61 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 8 Aug 2020 01:42:02 +0200
Subject: [PATCH] - build fixes for boost 1.73 and gcc 10 - rel 5

---
 boost-1.73.patch | 10 ++++++++++
 gcc10.patch      | 10 ++++++++++
 openscad.spec    |  6 +++++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 boost-1.73.patch
 create mode 100644 gcc10.patch

diff --git a/boost-1.73.patch b/boost-1.73.patch
new file mode 100644
index 0000000..64b3d05
--- /dev/null
+++ b/boost-1.73.patch
@@ -0,0 +1,10 @@
+--- openscad-2019.05/src/import.cc~	2019-03-31 06:14:41.000000000 +0200
++++ openscad-2019.05/src/import.cc	2020-08-08 01:19:22.113104409 +0200
+@@ -50,7 +50,6 @@
+ #include <boost/assign/std/vector.hpp>
+ using namespace boost::assign; // bring 'operator+=()' into scope
+ 
+-#include <boost/detail/endian.hpp>
+ #include <cstdint>
+ 
+ extern PolySet * import_amf(std::string, const Location &loc);
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..7b396a5
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,10 @@
+--- openscad-2019.05/src/parser.y~	2019-04-07 17:45:27.000000000 +0200
++++ openscad-2019.05/src/parser.y	2020-08-08 01:27:32.558842432 +0200
+@@ -46,6 +46,7 @@
+ #include "printutils.h"
+ #include "memory.h"
+ #include <sstream>
++#include <stack>
+ #include <boost/filesystem.hpp>
+ #include "boost-utils.h"
+ 
diff --git a/openscad.spec b/openscad.spec
index cef92ec..92f643f 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -8,7 +8,7 @@
 Summary:	The Programmers Solid 3D CAD Modeller
 Name:		openscad
 Version:	2019.05
-Release:	4
+Release:	5
 # COPYING contains a linking exception for CGAL
 # Appdata file is CC0
 # Examples are CC0
@@ -18,6 +18,8 @@ Source0:	http://files.openscad.org/%{name}-%{version}.src.tar.gz
 # Source0-md5:	2b63e249d56e2eba62ed5b042e1d82bc
 Patch0:		%{name}-polyclipping.patch
 Patch1:		localedir.patch
+Patch2:		boost-1.73.patch
+Patch3:		gcc10.patch
 URL:		http://www.openscad.org/
 BuildRequires:	Qt5Network-devel
 BuildRequires:	Qt5Concurrent-devel
@@ -148,6 +150,8 @@ expect some API changes, however many things are already working.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 # use system package
 %{__rm} -r src/ext/polyclipping
-- 
2.44.0