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

Accepting request 716644 from KDE:Applications

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/716644
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger 2019-07-26 10:24:37 +00:00 committed by Git OBS Bridge
commit 5e60d05920
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch Normal file
View File

@ -0,0 +1,33 @@
From 0ec637813bd04d042607ad2d36b70f61e4db7f70 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 16 Jul 2019 17:34:58 +0200
Subject: [PATCH] Revert "Adapt DBInitializer to behavior change of QPSQL
driver in Qt 5.13"
This reverts commit 74aed9542ba1ff1e6e93a550c42869647c4eba8e.
Apparently it breaks things with MySQL/MariaDB.
We don't really need this fix anyway as we reverted the corresponding
change in Qt.
References: boo#1141604, kde#409753
---
src/server/storage/dbintrospector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/server/storage/dbintrospector.cpp b/src/server/storage/dbintrospector.cpp
index 70d952a6f..224faf7f8 100644
--- a/src/server/storage/dbintrospector.cpp
+++ b/src/server/storage/dbintrospector.cpp
@@ -76,7 +76,7 @@ bool DbIntrospector::hasColumn(const QString &tableName, const QString &columnNa
QStringList columns = m_columnCache.value(tableName);
if (columns.isEmpty()) {
- const QSqlRecord table = m_database.record(tableName.toLower());
+ const QSqlRecord table = m_database.record(tableName);
const int numTables = table.count();
columns.reserve(numTables);
for (int i = 0; i < numTables; ++i) {
--
2.16.4

12
akonadi-server.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jul 18 19:46:45 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Use kf5_debugdir macro for specifying the logging categories location
-------------------------------------------------------------------
Tue Jul 16 15:39:06 UTC 2019 - wbauer@tmo.at
- Add patch to revert upstream PostgreSQL fix that apparently
causes problems with MySQL (boo#1141604, kde#409753):
* 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch
-------------------------------------------------------------------
Sat Jul 13 07:26:32 UTC 2019 - lbeltrame@kde.org

5
akonadi-server.spec
View File

@ -30,6 +30,8 @@ Group: System/GUI/KDE
URL: http://akonadi-project.org
Source: %{rname}-%{version}.tar.xz
Source99: akonadi-server-rpmlintrc
# PATCH-FIX-OPENSUSE
Patch0: 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch
BuildRequires: cmake >= 3.0.0
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: kf5-filesystem
@ -176,6 +178,7 @@ service.
%prep
%setup -q -n %{rname}-%{version}
%autopatch -p1
%build
%if 0%{?suse_version} < 1330
@ -240,7 +243,7 @@ service.
%{_kf5_plugindir}/akonadi/
%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
%{_kf5_sharedir}/mime/packages/akonadi-mime.xml
%{_kf5_sysconfdir}/xdg/akonadi.*categories
%{_kf5_debugdir}/akonadi.*categories
%files -n libKF5AkonadiAgentBase5
%license COPYING*