New upstream release & removing patches
- Removing upstream_prevent_misleading_notification.diff
- Removing upstream_fix_crash_on_pkglist_refresh.diff
- Updating series file
Clive Johnston
8 years ago
| 0 | |
upstream_prevent_misleading_notification.diff
|
| 1 | |
upstream_fix_crash_on_pkglist_refresh.diff
|
debian/patches/upstream_fix_crash_on_pkglist_refresh.diff
less
more
| 0 | |
From 811cca260f389271c330be43e068aa70f7165ba7 Mon Sep 17 00:00:00 2001
|
| 1 | |
From: Aleix Pol <aleixpol@kde.org>
|
| 2 | |
Date: Thu, 14 Jan 2016 15:43:51 +0100
|
| 3 | |
Subject: [PATCH 1/2] Fix crash
|
| 4 | |
|
| 5 | |
Makes sure that we don't update the state twice in a row. Otherwise
|
| 6 | |
we'd have a crash on the null pointer.
|
| 7 | |
|
| 8 | |
BUG: 357791
|
| 9 | |
---
|
| 10 | |
libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp | 3 +++
|
| 11 | |
1 file changed, 3 insertions(+)
|
| 12 | |
|
| 13 | |
diff --git a/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp b/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
|
| 14 | |
index 566b7fb..25abc99 100644
|
| 15 | |
--- a/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
|
| 16 | |
+++ b/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
|
| 17 | |
@@ -118,6 +118,9 @@ void ApplicationNotifier::recheckSystemUpdateNeeded()
|
| 18 | |
|
| 19 | |
void ApplicationNotifier::parseUpdateInfo()
|
| 20 | |
{
|
| 21 | |
+ if (!m_updateCheckerProcess)
|
| 22 | |
+ return;
|
| 23 | |
+
|
| 24 | |
#warning why does this parse stdout and not use qapt, wtf...
|
| 25 | |
m_securityUpdates = 0;
|
| 26 | |
m_normalUpdates = 0;
|
| 27 | |
--
|
| 28 | |
2.1.4
|
| 29 | |
|
debian/patches/upstream_prevent_misleading_notification.diff
less
more
| 0 | |
From 2ccd19a67fbd716093b31cf60bcd7c5c3643c960 Mon Sep 17 00:00:00 2001
|
| 1 | |
From: Aleix Pol <aleixpol@kde.org>
|
| 2 | |
Date: Thu, 14 Jan 2016 15:56:43 +0100
|
| 3 | |
Subject: [PATCH 2/2] Prevent misleading notification
|
| 4 | |
|
| 5 | |
BUG: 357613
|
| 6 | |
---
|
| 7 | |
notifier/DiscoverNotifier.cpp | 5 +++++
|
| 8 | |
1 file changed, 5 insertions(+)
|
| 9 | |
|
| 10 | |
diff --git a/notifier/DiscoverNotifier.cpp b/notifier/DiscoverNotifier.cpp
|
| 11 | |
index 4e803a8..acf93b0 100644
|
| 12 | |
--- a/notifier/DiscoverNotifier.cpp
|
| 13 | |
+++ b/notifier/DiscoverNotifier.cpp
|
| 14 | |
@@ -73,6 +73,11 @@ bool DiscoverNotifier::isSystemUpToDate() const
|
| 15 | |
|
| 16 | |
void DiscoverNotifier::showUpdatesNotification()
|
| 17 | |
{
|
| 18 | |
+ if (state()==NoUpdates) {
|
| 19 | |
+ //it's not very helpful to notify that everyting is in order
|
| 20 | |
+ return;
|
| 21 | |
+ }
|
| 22 | |
+
|
| 23 | |
//TODO: Better message strings
|
| 24 | |
QString msg = message();
|
| 25 | |
if (m_verbose) {
|
| 26 | |
--
|
| 27 | |
2.1.4
|
| 28 | |
|