From 3cdb028478768034adcf7514ef566e8d70e3348686beec23e6a55c8e13265663 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 28 Apr 2021 05:49:23 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=24 --- ...e-glib.h-outside-of-the-extern-block.patch | 37 +++++++++++++++++++ kexi.changes | 6 +++ kexi.spec | 2 + 3 files changed, 45 insertions(+) create mode 100644 0001-Include-glib.h-outside-of-the-extern-block.patch diff --git a/0001-Include-glib.h-outside-of-the-extern-block.patch b/0001-Include-glib.h-outside-of-the-extern-block.patch new file mode 100644 index 0000000..adbfb32 --- /dev/null +++ b/0001-Include-glib.h-outside-of-the-extern-block.patch @@ -0,0 +1,37 @@ +From 73d3fa8e7a1028c89b20c74f6444a76a722d8041 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 18 Apr 2021 11:47:30 +0200 +Subject: [PATCH] Include 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 ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -32,7 +34,6 @@ + #endif + #include + #include +-#include + + #ifdef HAVE_ICONV + #include +-- +2.31.1 + diff --git a/kexi.changes b/kexi.changes index b03a75b..a0d6eb6 100644 --- a/kexi.changes +++ b/kexi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 28 05:49:16 UTC 2021 - Christophe Giboudeaux + +- Add patch to fix build with glib >= 2.68 + * 0001-Include-glib.h-outside-of-the-extern-block.patch + ------------------------------------------------------------------- Fri Jan 8 10:51:47 UTC 2021 - Wolfgang Bauer diff --git a/kexi.spec b/kexi.spec index 74e4b1c..ba7f265 100644 --- a/kexi.spec +++ b/kexi.spec @@ -28,6 +28,8 @@ URL: http://www.kexi-project.org/ 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 From 284aec2d324fd61670847684f9f1f572711cef97d2fa5c910a918a885bcdff59 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 28 Apr 2021 05:49:41 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=25 --- kexi.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/kexi.spec b/kexi.spec index ba7f265..5a8d5d0 100644 --- a/kexi.spec +++ b/kexi.spec @@ -138,7 +138,6 @@ rm %{buildroot}%{_kf5_libdir}/libkformdesigner%{soVersion}.so %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