Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2021-04-12 12:36:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape" Mon Apr 12 12:36:07 2021 rev:113 rq:882806 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2021-02-04 20:21:48.886619862 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new.2401/inkscape.changes 2021-04-12 12:39:04.261488297 +0200 @@ -1,0 +2,5 @@ +Fri Mar 26 08:27:20 UTC 2021 - Dominique Leuenberger <[email protected]> + +- Add 2790.patch: fix build against glib 2.67.3. + +------------------------------------------------------------------- New: ---- 2790.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.I0MR64/_old 2021-04-12 12:39:06.077490408 +0200 +++ /var/tmp/diff_new_pack.I0MR64/_new 2021-04-12 12:39:06.077490408 +0200 @@ -27,6 +27,8 @@ # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.py +# PATCH-FIX-UPSTREAM 2790.patch [email protected] -- 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 @@ %lang_package %prep -%setup -q -n %{name}-%{_version} +%autosetup -n %{name}-%{_version} -p1 %build %ifarch %{arm} ++++++ 2790.patch ++++++ >From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001 From: Harald van Dijk <[email protected]> Date: Wed, 17 Feb 2021 09:13:49 +0000 Subject: [PATCH] Fix build with glib 2.67.3. As of glib 2.67.3, <glib.h> 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 <stdio.h> +#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 <glib.h> #include <glib-object.h> +#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
