Added fixes for the build on rawhide and f34

This commit is contained in:
Jan Horak 2021-02-16 14:24:34 +01:00
parent 8cbdbf5855
commit 9edc494e6f
3 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,19 @@
diff -up inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h.glib-extern inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h
--- inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h.glib-extern 2021-02-16 12:59:00.917852141 +0100
+++ inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h 2021-02-16 12:59:06.675894640 +0100
@@ -22,6 +22,7 @@
#define AUTOTRACE_H
#include <stdio.h>
+#include "types.h"
#ifdef __cplusplus
extern "C" {
@@ -35,7 +36,6 @@ extern "C" {
* Typedefs
* ===================================================================== */
-#include "types.h"
#include "color.h"
/* Third degree is the highest we deal with. */

View File

@ -0,0 +1,19 @@
diff -up inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp.missing-atomic inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp
--- inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp.missing-atomic 2021-02-16 13:35:58.455184020 +0100
+++ inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp 2021-02-16 13:36:11.411279411 +0100
@@ -10,6 +10,7 @@
#include <iostream>
#include <stdexcept>
#include <boost/utility.hpp>
+#include <atomic>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
@@ -31,6 +32,7 @@
#include "ui/tools/node-tool.h"
#include "ui/tools-switch.h"
+
namespace {
Inkscape::ControlType nodeTypeToCtrlType(Inkscape::UI::NodeType type)

View File

@ -16,6 +16,10 @@ Source0: https://inkscape.org/gallery/item/23820/inkscape-1.0.2.tar.xz
Source2: Fedora-Color-Palette.gpl
Patch1: inkscape-gcc11.patch
# Fixes build failures with type_traits:2900:3: error: template with C linkage
Patch3: inkscape-glib-extern.patch
# Fixes: error: field 'rel_error' has incomplete type 'std::atomic<double>'
Patch4: inkscape-missing-atomic.patch
Provides: bundled(libcroco)
Provides: bundled(autotrace)