Accepting request 829000 from graphics
OBS-URL: https://build.opensuse.org/request/show/829000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=108
This commit is contained in:
commit
75434963f3
10
inkscape-include-atomic.patch
Normal file
10
inkscape-include-atomic.patch
Normal file
@ -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>
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
||||||
|
|
||||||
|
- 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>
|
Thu Jun 11 09:17:36 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ Source: https://media.inkscape.org/dl/resources/file/%{name}-%{version}.
|
|||||||
# openSUSE palette file
|
# openSUSE palette file
|
||||||
Source1: openSUSE.gpl
|
Source1: openSUSE.gpl
|
||||||
Source2: inkscape-split-extensions-extra.py
|
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: cmake
|
||||||
BuildRequires: double-conversion-devel
|
BuildRequires: double-conversion-devel
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -118,9 +120,9 @@ Inkscape is a vector graphics editor.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{_version}
|
%setup -q -n %{name}-%{_version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%define _lto_cflags %{nil}
|
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
|
export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user