Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2019-07-26 12:24:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Fri Jul 26 12:24:37 2019 rev:60 rq:716644 version:19.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2019-07-16 08:29:34.531395422 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new.4126/akonadi-server.changes 2019-07-26 12:24:39.190452997 +0200 @@ -1,0 +2,12 @@ +Thu Jul 18 19:46:45 UTC 2019 - Stefan Brüns <[email protected]> + +- Use kf5_debugdir macro for specifying the logging categories location + +------------------------------------------------------------------- +Tue Jul 16 15:39:06 UTC 2019 - [email protected] + +- 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 + +------------------------------------------------------------------- New: ---- 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.Pw3HeT/_old 2019-07-26 12:24:40.194452585 +0200 +++ /var/tmp/diff_new_pack.Pw3HeT/_new 2019-07-26 12:24:40.198452584 +0200 @@ -30,6 +30,8 @@ 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 @@ %prep %setup -q -n %{rname}-%{version} +%autopatch -p1 %build %if 0%{?suse_version} < 1330 @@ -240,7 +243,7 @@ %{_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* ++++++ 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch ++++++ >From 0ec637813bd04d042607ad2d36b70f61e4db7f70 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> 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
