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
This commit is contained in:
parent
3dd60c2a21
commit
47c09dd2dc
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,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>
|
||||
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user