From 47c09dd2dc20e45a5097a0f8a5bb13863f2cebbaddacc21253b97719b3b1ac6a Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Mon, 24 Aug 2020 16:03:30 +0000
Subject: [PATCH 1/2] Accepting request 828910 from home:dimstar:Factory

Fix build in Staging:E with boost 1.74

OBS-URL: https://build.opensuse.org/request/show/828910
OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=66
---
 inkscape-include-atomic.patch | 10 ++++++++++
 inkscape.changes              |  7 +++++++
 inkscape.spec                 |  3 +++
 3 files changed, 20 insertions(+)
 create mode 100644 inkscape-include-atomic.patch

diff --git a/inkscape-include-atomic.patch b/inkscape-include-atomic.patch
new file mode 100644
index 0000000..96f2b6b
--- /dev/null
+++ b/inkscape-include-atomic.patch
@@ -0,0 +1,10 @@
+--- a/src/ui/tool/node.cpp	2020-05-01 15:18:52.000000000 +0200
++++ b/src/ui/tool/node.cpp	2020-08-18 01:25:05.266412299 +0200
+@@ -7,6 +7,7 @@
+  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+  */
+ 
++#include <atomic>
+ #include <iostream>
+ #include <stdexcept>
+ #include <boost/utility.hpp>
diff --git a/inkscape.changes b/inkscape.changes
index dcfd327..4cf9b2a 100644
--- a/inkscape.changes
+++ b/inkscape.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 24 08:45:25 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add inkscape-include-atomic.patch: Fix build with Boost 1.74,
+  where we can no longer rely on boost bringing the atomic header
+  into the game.
+
 -------------------------------------------------------------------
 Thu Jun 11 09:17:36 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>
 
diff --git a/inkscape.spec b/inkscape.spec
index bdd57f3..eece4ac 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -27,6 +27,8 @@ Source:         https://media.inkscape.org/dl/resources/file/%{name}-%{version}.
 # openSUSE palette file
 Source1:        openSUSE.gpl
 Source2:        inkscape-split-extensions-extra.py
+# PATCH-FIX-UPSTREAM inkscape-include-atomic.patch https://gitlab.com/inkscape/inkscape/-/issues/1798 -- Fix build with Boost 1.74
+Patch0:         inkscape-include-atomic.patch
 BuildRequires:  cmake
 BuildRequires:  double-conversion-devel
 BuildRequires:  fdupes
@@ -118,6 +120,7 @@ Inkscape is a vector graphics editor.
 
 %prep
 %setup -q -n %{name}-%{_version}
+%patch0 -p1
 
 %build
 %define _lto_cflags %{nil}

From 280123db95932a869187639dc37322ecb5c8855f920d2e34949af7ec77d5ce28 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Mon, 24 Aug 2020 16:08:01 +0000
Subject: [PATCH 2/2] Accepting request 828893 from
 home:marxin:branches:graphics

- Enable again LTO. It should work now.

OBS-URL: https://build.opensuse.org/request/show/828893
OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=67
---
 inkscape.changes | 5 +++++
 inkscape.spec    | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/inkscape.changes b/inkscape.changes
index 4cf9b2a..d548aa7 100644
--- a/inkscape.changes
+++ b/inkscape.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 24 09:46:20 UTC 2020 - Martin Liška <mliska@suse.cz>
+
+- Enable again LTO. It should work now.
+
 -------------------------------------------------------------------
 Mon Aug 24 08:45:25 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/inkscape.spec b/inkscape.spec
index eece4ac..289c8f3 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -123,7 +123,6 @@ Inkscape is a vector graphics editor.
 %patch0 -p1
 
 %build
-%define _lto_cflags %{nil}
 %ifarch %{arm}
 export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif