Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/inkscape.git#9edc494e6f1ad884a20973d79901e7279f003ce5

inkscape-glib-extern.patch

@@ -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.  */

inkscape-missing-atomic.patch

@@ -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)

inkscape.spec

@@ -2,7 +2,7 @@
 
 Name:           inkscape
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 # Inkscape tags their releases with underscores and in ALLCAPS
@@ -16,9 +16,16 @@ 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(libgdl)
+Provides: bundled(autotrace)
+Provides: bundled(libdepixelize)
+Provides: bundled(libuemf)
+Provides: bundled(adaptagrams)
 
 BuildRequires:  gcc-c++
 BuildRequires:  aspell-devel aspell-en
@@ -30,7 +37,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  double-conversion-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gc-devel >= 6.4
-BuildRequires:  gdlmm-devel
+BuildRequires:  libgdl-devel
 BuildRequires:  gettext
 BuildRequires:  gsl-devel
 BuildRequires:  gtkmm30-devel
@@ -224,6 +231,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
 
 
 %changelog
+* Thu Feb 11 2021 Jan Horak <jhorak@redhat.com> - 1.0.2-2
+- Added missing bundled source, removed libgdlmm depencency
+
 * Mon Feb 01 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.0.2-1
 - 1.0.2