From 01a7591fcc3d37bef2b8fe301c1398c34c6f24a82e5bdac6bad4cd22a4a36043 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 18 Jul 2019 05:13:51 +0000 Subject: [PATCH] Accepting request 716045 from home:wolfi323:branches:KDE:Applications - 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 OBS-URL: https://build.opensuse.org/request/show/716045 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=196 --- ...nitializer-to-behavior-change-of-QPS.patch | 33 +++++++++++++++++++ akonadi-server.changes | 7 ++++ akonadi-server.spec | 3 ++ 3 files changed, 43 insertions(+) create mode 100644 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch diff --git a/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch b/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch new file mode 100644 index 0000000..70f7fd5 --- /dev/null +++ b/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch @@ -0,0 +1,33 @@ +From 0ec637813bd04d042607ad2d36b70f61e4db7f70 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +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 + diff --git a/akonadi-server.changes b/akonadi-server.changes index 4cd7b95..5461d2c 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/akonadi-server.spec b/akonadi-server.spec index 79e4562..515a9ae 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -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