[SCM] KDE Discover packaging branch, kubuntu_wily_backports, updated. 53016851e44ef96df0fbc17d66740ead74f45961

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=5301685

The following commit has been merged in the kubuntu_wily_backports branch:
commit 53016851e44ef96df0fbc17d66740ead74f45961
Author: Philip Muškovac <yofel at gmx.net>
Date:   Thu Jan 14 16:13:37 2016 +0100

    Add upstream patches for some annoying issues
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  2 ++
 .../upstream_fix_crash_on_pkglist_refresh.diff     | 30 ++++++++++++++++++++++
 .../upstream_prevent_misleading_notification.diff  | 29 +++++++++++++++++++++
 4 files changed, 64 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2c8117a..7349991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,5 +12,8 @@ plasma-discover (5.5.3a-0ubuntu1) UNRELEASED; urgency=medium
     drop and prepare for the coming application rename in plasma 5.6
   * Add transitional packages for muon-discover, muon-updater and
     muon-notifier to help with upgrades
+  * Add patches from the Plasma/5.5 branch:
+    - upstream_fix_crash_on_pkglist_refresh.diff
+    - upstream_prevent_misleading_notification.diff
 
  -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 17:58:43 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eb422fd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream_prevent_misleading_notification.diff
+upstream_fix_crash_on_pkglist_refresh.diff
diff --git a/debian/patches/upstream_fix_crash_on_pkglist_refresh.diff b/debian/patches/upstream_fix_crash_on_pkglist_refresh.diff
new file mode 100644
index 0000000..58a2876
--- /dev/null
+++ b/debian/patches/upstream_fix_crash_on_pkglist_refresh.diff
@@ -0,0 +1,30 @@
+From 811cca260f389271c330be43e068aa70f7165ba7 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol at kde.org>
+Date: Thu, 14 Jan 2016 15:43:51 +0100
+Subject: [PATCH 1/2] Fix crash
+
+Makes sure that we don't update the state twice in a row. Otherwise
+we'd have a crash on the null pointer.
+
+BUG: 357791
+---
+ libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp b/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
+index 566b7fb..25abc99 100644
+--- a/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
++++ b/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
+@@ -118,6 +118,9 @@ void ApplicationNotifier::recheckSystemUpdateNeeded()
+     
+ void ApplicationNotifier::parseUpdateInfo()
+ {
++    if (!m_updateCheckerProcess)
++        return;
++
+ #warning why does this parse stdout and not use qapt, wtf...
+     m_securityUpdates = 0;
+     m_normalUpdates = 0;
+-- 
+2.1.4
+
diff --git a/debian/patches/upstream_prevent_misleading_notification.diff b/debian/patches/upstream_prevent_misleading_notification.diff
new file mode 100644
index 0000000..4ef28a8
--- /dev/null
+++ b/debian/patches/upstream_prevent_misleading_notification.diff
@@ -0,0 +1,29 @@
+From 2ccd19a67fbd716093b31cf60bcd7c5c3643c960 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol at kde.org>
+Date: Thu, 14 Jan 2016 15:56:43 +0100
+Subject: [PATCH 2/2] Prevent misleading notification
+
+BUG: 357613
+---
+ notifier/DiscoverNotifier.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/notifier/DiscoverNotifier.cpp b/notifier/DiscoverNotifier.cpp
+index 4e803a8..acf93b0 100644
+--- a/notifier/DiscoverNotifier.cpp
++++ b/notifier/DiscoverNotifier.cpp
+@@ -73,6 +73,11 @@ bool DiscoverNotifier::isSystemUpToDate() const
+ 
+ void DiscoverNotifier::showUpdatesNotification()
+ {
++    if (state()==NoUpdates) {
++        //it's not very helpful to notify that everyting is in order
++        return;
++    }
++
+     //TODO: Better message strings
+     QString msg = message();
+     if (m_verbose) {
+-- 
+2.1.4
+

-- 
KDE Discover packaging