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 + #include + #include + #include diff --git a/inkscape.changes b/inkscape.changes index dcfd327..d548aa7 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Aug 24 09:46:20 UTC 2020 - Martin Liška + +- Enable again LTO. It should work now. + +------------------------------------------------------------------- +Mon Aug 24 08:45:25 UTC 2020 - Dominique Leuenberger + +- 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 diff --git a/inkscape.spec b/inkscape.spec index bdd57f3..289c8f3 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,9 +120,9 @@ Inkscape is a vector graphics editor. %prep %setup -q -n %{name}-%{_version} +%patch0 -p1 %build -%define _lto_cflags %{nil} %ifarch %{arm} export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif