[SCM] muon packaging branch, kubuntu_stable, updated. 54cac92ad26567c17e0fcae1662b3b5a8402fca1
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Jan 13 17:35:32 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=c523e9f
The following commit has been merged in the kubuntu_stable branch:
commit c523e9f900bca7886929e958a05c59a2d8a5f4a8
Author: Harald Sitter <sitter at kde.org>
Date: Thu Jan 8 19:43:07 2015 +0100
Drop all patches, they all came from upstream anyway
---
debian/changelog | 1 +
debian/patches/series | 3 -
...he-number-of-updates-rather-than-checking.patch | 28 -----
...another-notification-if-the-data-didn-t-c.patch | 128 ---------------------
...threading-problem-involving-KSharedConfig.patch | 70 -----------
5 files changed, 1 insertion(+), 229 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a0fd2e6..816a001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ muon (5.1.50-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release based on KDE Frameworks 5
* muon-installer is no more remove binary package and all references
+ * Drop all patches, they all came from upstream anyway
-- Harald Sitter <sitter at kde.org> Thu, 08 Jan 2015 18:36:20 +0100
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fc9b067..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream_Don-t-post-another-notification-if-the-data-didn-t-c.patch
-upstream_Check-for-the-number-of-updates-rather-than-checking.patch
-upstream_Fix-threading-problem-involving-KSharedConfig.patch
diff --git a/debian/patches/upstream_Check-for-the-number-of-updates-rather-than-checking.patch b/debian/patches/upstream_Check-for-the-number-of-updates-rather-than-checking.patch
deleted file mode 100644
index 3c32c0b..0000000
--- a/debian/patches/upstream_Check-for-the-number-of-updates-rather-than-checking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4a5e63d925c7e6538b2fc025c1c86cfc40e2bd48 Mon Sep 17 00:00:00 2001
-From: Rohan Garg <rohan16garg at gmail.com>
-Date: Sun, 13 Apr 2014 20:17:01 +0200
-Subject: [PATCH] Check for the number of updates rather than checking for the
- updates-available file since the file can exist even when there are no
- updates
-
-REVIEWED-BY: Aleix Pol <aleixpol at kde.org>
----
- libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp b/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
-index c91605f..fe50193 100644
---- a/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
-+++ b/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
-@@ -139,7 +139,7 @@ void ApplicationNotifier::parseUpdateInfo()
-
- // ';' not found, apt-check broke :("
-
-- if (QFile::exists("/var/lib/update-notifier/updates-available")) {
-+ if (securityUpdates > 0 || updates > 0) {
- setSystemUpToDate(false, updates, securityUpdates, securityUpdates > 0 ? AbstractKDEDModule::SecurityUpdate : NormalUpdate);
- } else {
- setSystemUpToDate(true);
---
-1.9.1
-
diff --git a/debian/patches/upstream_Don-t-post-another-notification-if-the-data-didn-t-c.patch b/debian/patches/upstream_Don-t-post-another-notification-if-the-data-didn-t-c.patch
deleted file mode 100644
index 7a2fdaf..0000000
--- a/debian/patches/upstream_Don-t-post-another-notification-if-the-data-didn-t-c.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From a882eeb2574af5fe7931166787911cb09975d12c Mon Sep 17 00:00:00 2001
-From: Lukas Appelhans <l.appelhans at gmx.de>
-Date: Thu, 3 Apr 2014 01:21:28 +0200
-Subject: [PATCH] Don't post another notification if the data didn't change!
-
-BUG:331434
-
-Conflicts:
- libmuon/resources/AbstractKDEDModule.cpp
----
- libmuon/resources/AbstractKDEDModule.cpp | 27 ++++++++++++++++++++++-----
- libmuon/resources/AbstractKDEDModule.h | 9 +++++----
- libmuon/resources/AbstractResource.h | 1 +
- 3 files changed, 28 insertions(+), 9 deletions(-)
-
-diff --git a/libmuon/resources/AbstractKDEDModule.cpp b/libmuon/resources/AbstractKDEDModule.cpp
-index df9b6fb..75fa3df 100644
---- a/libmuon/resources/AbstractKDEDModule.cpp
-+++ b/libmuon/resources/AbstractKDEDModule.cpp
-@@ -37,7 +37,14 @@ class AbstractKDEDModule::Private
- {
- public:
- Private(AbstractKDEDModule * par, const QString &n, const QString &i)
-- : q(par), name(n), iconName(i), systemUpToDate(true), updateType(AbstractKDEDModule::NormalUpdate), statusNotifier(0) {}
-+ : q(par),
-+ name(n),
-+ iconName(i),
-+ systemUpToDate(true),
-+ updateType(AbstractKDEDModule::NormalUpdate),
-+ statusNotifier(0),
-+ updateCount(0),
-+ securityUpdateCount(0) {}
- ~Private() {}
-
- void __k__showMuon();
-@@ -50,6 +57,8 @@ public:
- AbstractKDEDModule::UpdateType updateType;
- KStatusNotifierItem * statusNotifier;
- bool verbose;
-+ int updateCount;
-+ int securityUpdateCount;
- };
-
- AbstractKDEDModule::AbstractKDEDModule(const QString &name, const QString &iconName, QObject * parent)
-@@ -119,14 +128,13 @@ void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount,
-
- void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount, int securityUpdateCount, UpdateType updateType, Notification notification)
- {
-- d->systemUpToDate = systemUpToDate;
-- d->updateType = updateType;
- if (!systemUpToDate) {
- emit systemUpdateNeeded();
- //TODO: Better message strings
- QString message;
- QString icon;
-- if (d->updateType == SecurityUpdate) {
-+
-+ if (updateType == SecurityUpdate) {
- message = i18n("A security update is available for your system.");
- icon = "security-low";
- } else {
-@@ -145,7 +153,12 @@ void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount,
- d->statusNotifier->setOverlayIconByName(icon);
- d->statusNotifier->setToolTip(icon, message, i18n("A system update is recommended"));
- d->statusNotifier->setStatus(KStatusNotifierItem::Active);
-- if (notification == ShowNotification) {
-+
-+ if (notification == ShowNotification ||
-+ (notification == ShowNotificationIfInformationChanged
-+ && (d->updateCount != updateCount
-+ || d->securityUpdateCount != securityUpdateCount
-+ || d->updateType != updateType))) {
- KNotification::event("Update", i18n("System update available"), message, KIcon("svn-update").pixmap(KIconLoader::SizeMedium), nullptr, KNotification::CloseOnTimeout, KComponentData("muonabstractnotifier"));
- }
- } else {
-@@ -153,6 +166,10 @@ void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount,
- d->statusNotifier->setStatus(KStatusNotifierItem::Passive);
- d->statusNotifier->setToolTip("security-high", i18n("Your system is up-to-date."), i18n("No system update available"));
- }
-+ d->updateCount = updateCount;
-+ d->securityUpdateCount = securityUpdateCount;
-+ d->systemUpToDate = systemUpToDate;
-+ d->updateType = updateType;
- }
-
- #include "AbstractKDEDModule.moc"
-diff --git a/libmuon/resources/AbstractKDEDModule.h b/libmuon/resources/AbstractKDEDModule.h
-index a88b9f8..4eb1196 100644
---- a/libmuon/resources/AbstractKDEDModule.h
-+++ b/libmuon/resources/AbstractKDEDModule.h
-@@ -36,7 +36,8 @@ public:
- };
- enum Notification {
- ShowNotification = 0,
-- DontShowNotification = 1
-+ DontShowNotification = 1,
-+ ShowNotificationIfInformationChanged = 2
- };
- Q_ENUMS(UpdateType);
- virtual ~AbstractKDEDModule();
-@@ -54,9 +55,9 @@ signals:
- protected:
- AbstractKDEDModule(const QString &name, const QString &iconName, QObject * parent);
-
-- void setSystemUpToDate(bool systemUpToDate, UpdateType updateType = NormalUpdate, Notification notification = ShowNotification);
-- void setSystemUpToDate(bool systemUpToDate, int updateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotification);
-- void setSystemUpToDate(bool systemUpToDate, int updateCount, int securityUpdateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotification);
-+ void setSystemUpToDate(bool systemUpToDate, UpdateType updateType = NormalUpdate, Notification notification = ShowNotificationIfInformationChanged);
-+ void setSystemUpToDate(bool systemUpToDate, int updateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotificationIfInformationChanged);
-+ void setSystemUpToDate(bool systemUpToDate, int updateCount, int securityUpdateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotificationIfInformationChanged);
-
- private:
- class Private;
-diff --git a/libmuon/resources/AbstractResource.h b/libmuon/resources/AbstractResource.h
-index dc4102d..0fb3d74 100644
---- a/libmuon/resources/AbstractResource.h
-+++ b/libmuon/resources/AbstractResource.h
-@@ -23,6 +23,7 @@
-
- #include <QtCore/QObject>
- #include <QUrl>
-+#include <QStringList>
-
- #include "libmuonprivate_export.h"
- #include "PackageState.h"
---
-1.9.1
-
diff --git a/debian/patches/upstream_Fix-threading-problem-involving-KSharedConfig.patch b/debian/patches/upstream_Fix-threading-problem-involving-KSharedConfig.patch
deleted file mode 100644
index 51c215f..0000000
--- a/debian/patches/upstream_Fix-threading-problem-involving-KSharedConfig.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 70cc5d6532829d8bf1a95cd46ca5403eb195e6ec Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol at kde.org>
-Date: Wed, 7 May 2014 18:16:37 +0200
-Subject: [PATCH] Fix threading problem involving KSharedConfig
-
-Stop using it in favor of QSharedPointer<KConfig>, so that we don't access
-the shared database, which is not thread-safe.
-
-BUG: 333599
----
- libmuon/backends/ApplicationBackend/Application.cpp | 7 +------
- libmuon/backends/ApplicationBackend/Application.h | 3 +--
- 2 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/libmuon/backends/ApplicationBackend/Application.cpp b/libmuon/backends/ApplicationBackend/Application.cpp
-index dda91e6..9ffae21 100644
---- a/libmuon/backends/ApplicationBackend/Application.cpp
-+++ b/libmuon/backends/ApplicationBackend/Application.cpp
-@@ -51,6 +51,7 @@
-
- Application::Application(const QString& fileName, QApt::Backend* backend)
- : AbstractResource(0)
-+ , m_data(new KConfig(fileName, KConfig::SimpleConfig))
- , m_backend(backend)
- , m_package(0)
- , m_isValid(true)
-@@ -60,7 +61,6 @@ Application::Application(const QString& fileName, QApt::Backend* backend)
- {
- static QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
-
-- m_data = desktopContents(fileName);
- m_isTechnical = getField("NoDisplay").toLower() == "true"
- || !hasField("Exec")
- || getField("NotShowIn", QByteArray()).contains(currentDesktop)
-@@ -435,11 +435,6 @@ int Application::downloadSize()
- return m_package->downloadSize();
- }
-
--KSharedConfigPtr Application::desktopContents(const QString& filename)
--{
-- return KSharedConfig::openConfig(filename, KConfig::SimpleConfig);
--}
--
- void Application::clearPackage()
- {
- m_package = 0;
-diff --git a/libmuon/backends/ApplicationBackend/Application.h b/libmuon/backends/ApplicationBackend/Application.h
-index 00f29b1..af31cfc 100644
---- a/libmuon/backends/ApplicationBackend/Application.h
-+++ b/libmuon/backends/ApplicationBackend/Application.h
-@@ -100,7 +100,7 @@ private slots:
- private:
- QString buildDescription(const QByteArray& data, const QString& source);
-
-- KSharedConfigPtr m_data;
-+ QSharedPointer<KConfig> m_data;
- QApt::Backend *m_backend;
- QApt::Package *m_package;
- QByteArray m_packageName;
-@@ -110,7 +110,6 @@ private:
- bool m_isExtrasApp;
- bool m_sourceHasScreenshot;
-
-- KSharedConfigPtr desktopContents(const QString& filename);
- QApt::PackageList addons();
- QVector<QPair<QString, QString> > locateApplication(const QString &_relPath, const QString &menuId) const;
- bool hasField(const char* field) const;
---
-1.9.1
-
--
muon packaging
More information about the pkg-kde-commits
mailing list