pool/kexi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 888903 from KDE:Extra

Browse Source 
- Add patch to fix build with glib >= 2.68
  * 0001-Include-glib.h-outside-of-the-extern-block.patch

OBS-URL: https://build.opensuse.org/request/show/888903
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexi?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2021-04-28 23:38:04 +00:00 committed by Git OBS Bridge
commit 275a911586
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-Include-glib.h-outside-of-the-extern-block.patch Normal file
View File

@ -0,0 +1,37 @@
From 73d3fa8e7a1028c89b20c74f6444a76a722d8041 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heiko.becker@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
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

6
kexi.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 28 05:49:16 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- 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 <wbauer@tmo.at>

3
kexi.spec
View File

@ -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
@ -136,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