Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package seafile for openSUSE:Factory checked in at 2021-04-29 01:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seafile (Old) and /work/SRC/openSUSE:Factory/.seafile.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seafile" Thu Apr 29 01:37:58 2021 rev:6 rq:888928 version:7.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/seafile/seafile.changes 2020-10-13 15:44:00.493407299 +0200 +++ /work/SRC/openSUSE:Factory/.seafile.new.12324/seafile.changes 2021-04-29 01:39:03.086633805 +0200 @@ -1,0 +2,5 @@ +Wed Apr 28 05:50:49 UTC 2021 - Paolo Stivanin <[email protected]> + +- Add seafile-fix-compilation-glib2_68.patch + +------------------------------------------------------------------- New: ---- seafile-fix-compilation-glib2_68.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seafile.spec ++++++ --- /var/tmp/diff_new_pack.su0GgT/_old 2021-04-29 01:39:03.562634480 +0200 +++ /var/tmp/diff_new_pack.su0GgT/_new 2021-04-29 01:39:03.566634486 +0200 @@ -1,7 +1,7 @@ # # spec file for package seafile # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,6 +23,8 @@ License: GPL-2.0-only URL: https://github.com/haiwen/seafile/ Source0: https://github.com/haiwen/seafile/archive/v%{version}.tar.gz +#PATCH-FIX-UPSTREAM https://github.com/haiwen/seafile/pull/2428 +Patch0: seafile-fix-compilation-glib2_68.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake @@ -79,6 +81,9 @@ sed -i -e /\(DESTDIR\)/d lib/libseafile.pc.in sed -i -e 's@#!%{_bindir}/env python@#!%{_bindir}/python3@' app/seaf-cli sed -i -e 's@#!%{_bindir}/python33@#!%{_bindir}/python3@' app/seaf-cli +%if 0%{?suse_version} > 1500 +%patch0 -p1 +%endif %build ./autogen.sh ++++++ seafile-fix-compilation-glib2_68.patch ++++++ >From 935f6a6ef56c883949c8dcbd5a13d2c515b506fd Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin <[email protected]> Date: Sun, 14 Feb 2021 20:06:02 +0000 Subject: [PATCH] Wrap public declarations with G_BEGIN_DECLS/G_END_DECLS Glib release 2.67.3 started conditionally using some C++ code[1] in the public headers and it's no longer legal to include "glib.h" or anything that includes it transitively from `extern "C"` block. The solution recommended by the glib developers is to enclose all declarations in a header within G_BEGIN_DECLS and G_END_DECLS as shown in gobject developer manual[2]. Since G_BEGIN/END_DECLS expands to an `extern "C"` block it's also acceptable to use it directly when "glib.h" is not included in the current header file. [1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715 [2] https://developer.gnome.org/gobject/stable/howto-gobject.html#howto-gobject-header --- include/seafile-rpc.h | 5 +++++ include/seafile.h | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/include/seafile-rpc.h b/include/seafile-rpc.h index 36d22f68f..b27b261ea 100644 --- a/include/seafile-rpc.h +++ b/include/seafile-rpc.h @@ -5,6 +5,8 @@ #include <jansson.h> #include "seafile-object.h" +G_BEGIN_DECLS + /** * seafile_get_repo_list: * @@ -216,4 +218,7 @@ seafile_shutdown (GError **error); char* seafile_sync_error_id_to_str (int error_id, GError **error); + +G_END_DECLS + #endif diff --git a/include/seafile.h b/include/seafile.h index 11aa6313a..75ca665ca 100644 --- a/include/seafile.h +++ b/include/seafile.h @@ -3,6 +3,10 @@ #ifndef SEAFILE_H #define SEAFILE_H +#ifdef __cplusplus +extern "C" { +#endif + int seafile_destroy_repo (SearpcClient *client, const char *repo_id, GError **error); @@ -39,5 +43,8 @@ char *seafile_get_config (SearpcClient *client, const char *key, GError **error) int seafile_calc_dir_size (SearpcClient *client, const char *path, GError **error); +#ifdef __cplusplus +} +#endif #endif
