diff --git a/2790.patch b/2790.patch new file mode 100644 index 0000000..a6efe98 --- /dev/null +++ b/2790.patch @@ -0,0 +1,65 @@ +From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001 +From: Harald van Dijk +Date: Wed, 17 Feb 2021 09:13:49 +0000 +Subject: [PATCH] Fix build with glib 2.67.3. + +As of glib 2.67.3, can no longer be included in extern "C" +blocks. It was indirectly included by both "types.h" and "color.h". +"types.h" already does not need to be wrapped in an extern "C" block, +"color.h" does but can be modified not to, so with that changed they can +be moved out. +--- + src/3rdparty/autotrace/autotrace.h | 6 +++--- + src/3rdparty/autotrace/color.h | 7 +++++++ + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h +index 2ce6f272a9..e56be9a74c 100644 +--- a/src/3rdparty/autotrace/autotrace.h ++++ b/src/3rdparty/autotrace/autotrace.h +@@ -23,6 +23,9 @@ + + #include + ++#include "types.h" ++#include "color.h" ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ +@@ -35,9 +38,6 @@ extern "C" { + * Typedefs + * ===================================================================== */ + +-#include "types.h" +-#include "color.h" +- + /* Third degree is the highest we deal with. */ + enum _at_polynomial_degree { + AT_LINEARTYPE = 1, +diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h +index e50ab30ae0..88651db9f7 100644 +--- a/src/3rdparty/autotrace/color.h ++++ b/src/3rdparty/autotrace/color.h +@@ -24,6 +24,10 @@ + #include + #include + ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ + typedef struct _at_color at_color; + struct _at_color { + guint8 r; +@@ -43,4 +47,7 @@ void at_color_free(at_color * color); + GType at_color_get_type(void); + #define AT_TYPE_COLOR (at_color_get_type ()) + ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ + #endif /* not AT_COLOR_H */ +-- +GitLab + diff --git a/inkscape.changes b/inkscape.changes index f8f15d5..11f44fb 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 26 08:27:20 UTC 2021 - Dominique Leuenberger + +- Add 2790.patch: fix build against glib 2.67.3. + ------------------------------------------------------------------- Mon Jan 25 12:43:45 UTC 2021 - Paolo Stivanin diff --git a/inkscape.spec b/inkscape.spec index 43d5fa9..087e1ba 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 2790.patch dimstar@opensuse.org -- Fix build against glib 2.67.3 +Patch0: https://gitlab.com/inkscape/inkscape/-/merge_requests/2790.patch BuildRequires: cmake BuildRequires: double-conversion-devel BuildRequires: fdupes @@ -130,7 +132,7 @@ Inkscape is a vector graphics editor. %lang_package %prep -%setup -q -n %{name}-%{_version} +%autosetup -n %{name}-%{_version} -p1 %build %ifarch %{arm}