[neon/extras/kexi/Neon/release] debian: fix build with glib >= 2.68

[Pino Toscano]

Git commit 875ed8683531edc8d3504af7f8a5c5559c74d9da by Pino Toscano.
Committed on 21/08/2021 at 16:53.
Pushed by jriddell into branch 'Neon/release'.

fix build with glib >= 2.68

backport upstream commit 73d3fa8e7a1028c89b20c74f6444a76a722d8041

M  +3    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +40   -0    debian/patches/upstream_Include-glib.h-outside-of-the-extern-block.patch

https://invent.kde.org/neon/extras/kexi/commit/875ed8683531edc8d3504af7f8a5c5559c74d9da

diff --git a/debian/changelog b/debian/changelog
index c9ae15b..02f4a7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ kexi (1:3.2.0-3) UNRELEASED; urgency=medium
     - stop passing --fail-missing to dh_missing, as it is the default behaviour
   * Use execute_after_dh_auto_install to avoid invoking dh_auto_install
     manually.
+  * Backport upstream commit 73d3fa8e7a1028c89b20c74f6444a76a722d8041 to fix
+    build with glib >= 2.68; patch
+    upstream_Include-glib.h-outside-of-the-extern-block.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 21 Aug 2021 18:05:38 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 20233ee..adb31b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 upstream_Fix-build-with-Qt-5.13.patch
+upstream_Include-glib.h-outside-of-the-extern-block.patch
diff --git a/debian/patches/upstream_Include-glib.h-outside-of-the-extern-block.patch b/debian/patches/upstream_Include-glib.h-outside-of-the-extern-block.patch
new file mode 100644
index 0000000..0ee1484
--- /dev/null
+++ b/debian/patches/upstream_Include-glib.h-outside-of-the-extern-block.patch
@@ -0,0 +1,40 @@
+From 73d3fa8e7a1028c89b20c74f6444a76a722d8041 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker at kde.org>
+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
+---
+ src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+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.32.0
+