Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kexi for openSUSE:Factory checked in at 2021-04-29 01:38:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kexi (Old) and /work/SRC/openSUSE:Factory/.kexi.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kexi" Thu Apr 29 01:38:04 2021 rev:10 rq:888903 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kexi/kexi.changes 2021-01-14 15:05:48.790820903 +0100 +++ /work/SRC/openSUSE:Factory/.kexi.new.12324/kexi.changes 2021-04-29 01:39:04.922636408 +0200 @@ -1,0 +2,6 @@ +Wed Apr 28 05:49:16 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Add patch to fix build with glib >= 2.68 + * 0001-Include-glib.h-outside-of-the-extern-block.patch + +------------------------------------------------------------------- New: ---- 0001-Include-glib.h-outside-of-the-extern-block.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kexi.spec ++++++ --- /var/tmp/diff_new_pack.kTwzyH/_old 2021-04-29 01:39:05.450637156 +0200 +++ /var/tmp/diff_new_pack.kTwzyH/_new 2021-04-29 01:39:05.454637162 +0200 @@ -28,6 +28,8 @@ Source0: https://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM Patch0: Fix-build-with-Qt-5_13.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Include-glib.h-outside-of-the-extern-block.patch BuildRequires: extra-cmake-modules BuildRequires: glib2-devel BuildRequires: kdb-devel @@ -136,7 +138,6 @@ %files %license COPYING COPYING.* %doc AUTHORS README.md -%dir %{_kf5_appstreamdir} %dir %{_kf5_iconsdir}/hicolor/1024x1024 %dir %{_kf5_iconsdir}/hicolor/1024x1024/apps %{_kf5_applicationsdir}/org.kde.kexi-%{soVersion}.desktop ++++++ 0001-Include-glib.h-outside-of-the-extern-block.patch ++++++ >From 73d3fa8e7a1028c89b20c74f6444a76a722d8041 Mon Sep 17 00:00:00 2001 From: Heiko Becker <[email protected]> Date: Sun, 18 Apr 2021 11:47:30 +0200 Subject: [PATCH] Include <glib.h> outside of the extern block This fixes the build with glib >= 2.68. It's caused by [1] and glib upstream did not want to include a workaround because the fixes downstream seem trivial [2][3]. [1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715 [2] https://gitlab.gnome.org/GNOME/glib/-/issues/2331 [3] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1935 diff --git a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h index 31f48c171..56276e2d6 100644 --- a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h +++ b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h @@ -18,6 +18,8 @@ #ifndef _mdbtools_h_ #define _mdbtools_h_ +#include <glib.h> + #ifdef __cplusplus extern "C" { #endif @@ -32,7 +34,6 @@ #endif #include <ctype.h> #include <string.h> -#include <glib.h> #ifdef HAVE_ICONV #include <iconv.h> -- 2.31.1
