Accepting request 633855 from KDE:Applications

KDE Applications 18.08.1 (forwarded request 633799 from luca_b)

OBS-URL: https://build.opensuse.org/request/show/633855
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=48

Fix-crash-when-NotificationCollector-does-not-have-Connection.patch

@@ -1,46 +0,0 @@
-From 0297248b0e768516236bdfeb55d04e8d4f4b1c80 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Mon, 27 Aug 2018 23:26:02 +0200
-Subject: Fix crash when NotificationCollector does not have Connection
-
-This can happen when the NotificationCollector is invoked internally
-for instance from the SearchManager.
-
-BUG: 397239
-FIXED-IN: 5.9.1
----
- src/server/connection.cpp                    | 4 +++-
- src/server/storage/notificationcollector.cpp | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/server/connection.cpp b/src/server/connection.cpp
-index 832cc67..3e1f43d 100644
---- a/src/server/connection.cpp
-+++ b/src/server/connection.cpp
-@@ -79,7 +79,9 @@ Connection::Connection(quintptr socketDescriptor, QObject *parent)
- 
- Connection *Connection::self()
- {
--    Q_ASSERT(sConnectionStore->hasLocalData());
-+    if (!sConnectionStore->hasLocalData()) {
-+        return nullptr;
-+    }
-     return sConnectionStore->localData();
- }
- 
-diff --git a/src/server/storage/notificationcollector.cpp b/src/server/storage/notificationcollector.cpp
-index 4c70141..b92ee96 100644
---- a/src/server/storage/notificationcollector.cpp
-+++ b/src/server/storage/notificationcollector.cpp
-@@ -535,7 +535,7 @@ void NotificationCollector::completeNotification(const Protocol::ChangeNotificat
-             // we emit a notification without it and leave it up to the Monitor
-             // to retrieve the Item on demand - we should have a RID stored in
-             // Akonadi by then.
--            if (allHaveRID || msg->operation() != Protocol::ItemChangeNotification::Add) {
-+            if (Connection::self() && (allHaveRID || msg->operation() != Protocol::ItemChangeNotification::Add)) {
- 
-                 // Prevent transactions inside FetchHelper to recursively call our slot
-                 QScopedValueRollback<bool> ignoreTransactions(mIgnoreTransactions);
--- 
-cgit v0.11.2
-

akonadi-18.08.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf9edb4c0d6ea3f1ef2139ebcb1bb1532a1decfd52f9989597d42dc209b24119
-size 1537220

akonadi-18.08.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71296a35b0cf6cb1b603685da6cd59ad45ebd0b8a3ba7e933b13bf65fbf8373a
+size 1538372

akonadi-server.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Sep 06 18:42:50 UTC 2018 - lbeltrame@kde.org
+
+- Update to 18.08.1
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.08.1.php
+- Changes since 18.08.0:
+  * Attempt to mitigate trx deadlocks with SELECT ... FOR UPDATE
+  * Fix crash when NotificationCollector does not have Connection (kde#397239)
+  * Akonadi: forget about jobtracker if akonadiconsole went away
+  * Akonadi protocol: an invalid response is still a response.
+  * Use nullptr to fix gcc7 warning
+  * JobTracker: publish all jobs in the session when first connecting
+  * Debug output: show which collection we're syncing.
+  * fsck output: print out collection ID as well, for items with no RID
+  * Disable remote logging for inside Akonadi Console process
+  * Split out search-related debug output into own category.
+- Removed patches, now upstream:
+  * Fix-crash-when-NotificationCollector-does-not-have-Connection.patch
+
 -------------------------------------------------------------------
 Tue Aug 28 08:35:13 UTC 2018 - wbauer@tmo.at
 
@@ -13,17 +34,17 @@ Thu Aug 16 21:59:56 UTC 2018 - christophe@krop.fr
   * For more details please see:
   * https://www.kde.org/announcements/announce-applications-18.08.0.php
 - Changes since 18.07.80:
-  * Don't fetch missing parts from the resource. 
+  * Don't fetch missing parts from the resource.
-  * Revert "ProtocolHelper: only unserialize payload we requested" 
+  * Revert "ProtocolHelper: only unserialize payload we requested"
   * Monitor: rebuild Item from ntf if it's mustRetrieve but IFS is empty (kde#397131)
-  * ProtocolHelper: only unserialize payload we requested 
+  * ProtocolHelper: only unserialize payload we requested
-  * Fix warning due to deleteLater on null object 
+  * Fix warning due to deleteLater on null object
-  * Server: create new Collection in a single step 
+  * Server: create new Collection in a single step
-  * Monitor: fix broken subscription to only Item or Collection ntfs 
+  * Monitor: fix broken subscription to only Item or Collection ntfs
   * Server: fix Item notifications being rejected on mimetype filters (kde#396781)
-  * Monitor: invalidate pending notifications on change 
+  * Monitor: invalidate pending notifications on change
-  * Notifications: retrieve Item when RID is missing 
+  * Notifications: retrieve Item when RID is missing
-  * DataStore: don't access mNotificationCollector directly 
+  * DataStore: don't access mNotificationCollector directly
 
 -------------------------------------------------------------------
 Thu Jul 26 13:00:24 UTC 2018 - lbeltrame@kde.org

akonadi-server.spec

@@ -20,7 +20,7 @@
 
 %define rname   akonadi
 Name:           akonadi-server
-Version:        18.08.0
+Version:        18.08.1
 Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
@@ -31,8 +31,6 @@ Group:          System/GUI/KDE
 Url:            http://akonadi-project.org
 Source:         %{rname}-%{version}.tar.xz
 Source99:       akonadi-server-rpmlintrc
-# PATCH-FIX-UPSTREAM
-Patch:          Fix-crash-when-NotificationCollector-does-not-have-Connection.patch
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_graph-devel
 BuildRequires:  libboost_headers-devel
@@ -184,7 +182,6 @@ service.
 
 %prep
 %setup -q -n %{rname}-%{version}
-%patch -p1
 
 %build
   %if 0%{?suse_version} < 1330