From 3ef451193444393966823945eea5c66c5e71e5b474d6188752896e5d5d3cd3c5 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Wed, 7 Aug 2019 18:40:39 +0000
Subject: [PATCH] KDE Applications 19.08 RC

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=201
---
 ...nitializer-to-behavior-change-of-QPS.patch | 33 -------------------
 akonadi-19.07.80.tar.xz                       |  3 --
 akonadi-19.07.90.tar.xz                       |  3 ++
 akonadi-server.changes                        | 12 +++++++
 akonadi-server.spec                           |  5 +--
 5 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch
 delete mode 100644 akonadi-19.07.80.tar.xz
 create mode 100644 akonadi-19.07.90.tar.xz

diff --git a/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch b/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch
deleted file mode 100644
index 70f7fd5..0000000
--- a/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
diff --git a/akonadi-19.07.80.tar.xz b/akonadi-19.07.80.tar.xz
deleted file mode 100644
index 9cc4c01..0000000
--- a/akonadi-19.07.80.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df539ab1883915f35a1dfd94b0cafc016b36309064b4732966625e64191203b8
-size 1579328
diff --git a/akonadi-19.07.90.tar.xz b/akonadi-19.07.90.tar.xz
new file mode 100644
index 0000000..3e8a04b
--- /dev/null
+++ b/akonadi-19.07.90.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:424a70b218aa12c73e9df2cf4e5357dc9e093e1ebdaa8601b3f0782e8f162734
+size 1574276
diff --git a/akonadi-server.changes b/akonadi-server.changes
index f809e9d..9c5091a 100644
--- a/akonadi-server.changes
+++ b/akonadi-server.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 06 16:50:46 UTC 2019 - lbeltrame@kde.org
+
+- Update to 19.07.90
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-19.08-rc.php
+- Changes since 19.07.80:
+  * Fix compatibility with QMYSQL driver after 74aed95
+- Dropped patches, superseded by upstream changes:
+  * 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch
+
 -------------------------------------------------------------------
 Tue Jul 23 11:58:54 UTC 2019 - lbeltrame@kde.org
 
diff --git a/akonadi-server.spec b/akonadi-server.spec
index 4d4ec6c..4b0ff5b 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -22,7 +22,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-server
-Version:        19.07.80
+Version:        19.07.90
 Release:        0
 Summary:        PIM Storage Service
 License:        LGPL-2.1-or-later
@@ -30,8 +30,6 @@ 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
@@ -178,7 +176,6 @@ service.
 
 %prep
 %setup -q -n %{rname}-%{version}
-%autopatch -p1
 
 %build
   %if 0%{?suse_version} < 1330