Hello community, here is the log from the commit of package plasma5-pk-updates for openSUSE:Factory checked in at 2016-02-22 08:56:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-pk-updates (Old) and /work/SRC/openSUSE:Factory/.plasma5-pk-updates.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-pk-updates" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-pk-updates/plasma5-pk-updates.changes 2016-02-09 16:48:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-pk-updates.new/plasma5-pk-updates.changes 2016-02-22 08:56:07.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Feb 15 21:36:47 UTC 2016 - wba...@tmo.at + +- Add use-native-plasma-components.patch: fixes problems with dark + Plasma themes (boo#953669, kde#359308) + +------------------------------------------------------------------- +Fri Feb 12 10:16:43 UTC 2016 - tittiatc...@gmail.com + +- Add translations (plasma-pk-updates-lang.tar.xz) + +------------------------------------------------------------------- +Thu Feb 11 14:42:21 UTC 2016 - tittiatc...@gmail.com + +- Add patch change-refresh-logic.patch. This prevents the plasmoid + from starting the PackageKit Daemon on a hourly basis. This also + prevents unnecessary notifications. + (boo#955352) + +------------------------------------------------------------------- New: ---- change-refresh-logic.patch plasma-pk-updates-lang.tar.xz use-native-plasma-components.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-pk-updates.spec ++++++ --- /var/tmp/diff_new_pack.yk4F2o/_old 2016-02-22 08:56:08.000000000 +0100 +++ /var/tmp/diff_new_pack.yk4F2o/_new 2016-02-22 08:56:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package plasma5-pk-updates # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,11 @@ Url: http://www.kde.org Source: v%{version}.tar.gz Patch0: gcc48.diff +Source1: plasma-pk-updates-lang.tar.xz +# PATCH-FIX-OPENSUSE change-refresh-logic.patch -- Change the logic that the PackageKit daemon is only getting a request according to the set frequency +Patch1: change-refresh-logic.patch +# PATCH-FIX-UPSTREAM use-native-plasma-components.patch boo#953669, kde#359308 -- fixes problems with dark Plasma themes +Patch2: use-native-plasma-components.patch BuildRequires: PackageKit-Qt5-devel BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= 1.3.0 @@ -39,19 +44,25 @@ BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Widgets) +Recommends: %{name}-lang = %{version} %if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" # Use a fake version number as that the apper version is higher than 0.2 Provides: apper = 1.0 Obsoletes: apper < 1.0 +Obsoletes: apper-lang < 1.0 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Plasma applet for software updates using PackageKit. +%lang_package %prep -%setup -q -n plasma-pk-updates-%{version} +%setup -q -n plasma-pk-updates-%{version} -a 1 %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +echo "ki18n_install(po)" >> CMakeLists.txt %build %cmake_kf5 -d build @@ -59,6 +70,11 @@ %install %kf5_makeinstall -C build + %find_lang pkupdates plasma-pk-updates.lang + %find_lang plasma_applet_org.kde.plasma.pkupdates plasma-pk-updates.lang + +%files lang -f plasma-pk-updates.lang +%defattr(-,root,root) %files %defattr(-,root,root) ++++++ change-refresh-logic.patch ++++++ >From 06e21dffef7286d79718bdf49590aa8d90c24991 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <tittiatc...@gmail.com> Date: Thu, 11 Feb 2016 10:15:41 +0100 Subject: change the refresh logic and avoid unnecessary calls to the PackageKit Daemon diff -urB plasma-pk-updates-0.2/src/declarative/pkupdates.cpp new/src/declarative/pkupdates.cpp --- plasma-pk-updates-0.2/src/declarative/pkupdates.cpp 2015-04-06 20:52:42.000000000 +0200 +++ new/src/declarative/pkupdates.cpp 2016-02-11 15:49:38.001607501 +0100 @@ -189,19 +189,20 @@ return i18n("Last updated: never"); } -void PkUpdates::checkUpdates(bool force) +void PkUpdates::checkUpdates() { - qDebug() << "Checking updates, forced:" << force; + qDebug() << "Checking updates, forced"; - if (force) { // save the timestamp - KConfigGroup grp(KSharedConfig::openConfig("plasma-pk-updates"), "General"); - grp.writeEntry("Timestamp", QDateTime::currentDateTime().toMSecsSinceEpoch()); - grp.sync(); - } + // save the timestamp + KConfigGroup grp(KSharedConfig::openConfig("plasma-pk-updates"), "General"); + grp.writeEntry("Timestamp", QDateTime::currentDateTime().toMSecsSinceEpoch()); + grp.sync(); - m_cacheTrans = PackageKit::Daemon::refreshCache(force); + // ask the PackageKit daemon to refresh the cache + m_cacheTrans = PackageKit::Daemon::refreshCache(true); setActivity(CheckingUpdates); + // evaluate the result connect(m_cacheTrans.data(), &PackageKit::Transaction::statusChanged, this, &PkUpdates::onStatusChanged); connect(m_cacheTrans.data(), &PackageKit::Transaction::finished, this, &PkUpdates::onFinished); connect(m_cacheTrans.data(), &PackageKit::Transaction::errorCode, this, &PkUpdates::onErrorCode); diff -urB plasma-pk-updates-0.2/src/declarative/pkupdates.h new/src/declarative/pkupdates.h --- plasma-pk-updates-0.2/src/declarative/pkupdates.h 2015-04-06 20:52:42.000000000 +0200 +++ new/src/declarative/pkupdates.h 2016-02-11 15:47:59.129045166 +0100 @@ -162,7 +162,7 @@ * * @param force whether to force the cache refresh */ - Q_INVOKABLE void checkUpdates(bool force = false); + Q_INVOKABLE void checkUpdates(); /** * Launch the update process diff -urB plasma-pk-updates-0.2/src/plasma/contents/ui/Full.qml new/src/plasma/contents/ui/Full.qml --- plasma-pk-updates-0.2/src/plasma/contents/ui/Full.qml 2015-04-06 20:52:42.000000000 +0200 +++ new/src/plasma/contents/ui/Full.qml 2016-02-11 15:47:59.129045166 +0100 @@ -170,7 +170,7 @@ } text: i18n("Check For Updates") tooltip: i18n("Checks for any available updates") - onClicked: PkUpdates.checkUpdates(true) // circumvent the checks, the user knows what they're doing ;) + onClicked: PkUpdates.checkUpdates() // circumvent the checks, the user knows what they're doing ;) } Button { diff -urB plasma-pk-updates-0.2/src/plasma/contents/ui/main.qml new/src/plasma/contents/ui/main.qml --- plasma-pk-updates-0.2/src/plasma/contents/ui/main.qml 2015-04-06 20:52:42.000000000 +0200 +++ new/src/plasma/contents/ui/main.qml 2016-02-11 15:47:59.129045166 +0100 @@ -50,8 +50,8 @@ triggeredOnStart: true interval: 1000 * 60 * 60; // 1 hour onTriggered: { - if (networkAllowed() && batteryAllowed()) - PkUpdates.checkUpdates(needsForcedUpdate()) + if (needsForcedUpdate() && networkAllowed() && batteryAllowed()) + PkUpdates.checkUpdates() } } ++++++ use-native-plasma-components.patch ++++++ From: Jan Grulich <jgrul...@redhat.com> Date: Mon, 15 Feb 2016 12:40:45 +0000 Subject: Use native plasma components X-Git-Url: http://quickgit.kde.org/?p=plasma-pk-updates.git&a=commitdiff&h=fccda5d0a74348b9eb252fc21069cca36a5dc516 --- Use native plasma components BUG:359308 --- --- a/src/plasma/contents/ui/Full.qml +++ b/src/plasma/contents/ui/Full.qml @@ -90,7 +90,8 @@ rightMargin: Math.round(units.gridUnit / 2) } spacing: units.largeSpacing - Label { + + PlasmaComponents.Label { id: timestampLabel visible: !PkUpdates.isActive wrapMode: Text.WordWrap @@ -99,7 +100,8 @@ opacity: 0.6; text: PkUpdates.timestamp } - Label { + + PlasmaComponents.Label { visible: PkUpdates.isActive font.pointSize: theme.smallestFont.pointSize; opacity: 0.6; @@ -159,7 +161,7 @@ } } - Button { + PlasmaComponents.Button { id: btnCheck visible: !PkUpdates.count && PkUpdates.isNetworkOnline && !PkUpdates.isActive enabled: !PkUpdates.isActive @@ -173,7 +175,7 @@ onClicked: PkUpdates.checkUpdates() // circumvent the checks, the user knows what they're doing ;) } - Button { + PlasmaComponents.Button { id: btnUpdate visible: PkUpdates.count && PkUpdates.isNetworkOnline && !PkUpdates.isActive enabled: __anySelected @@ -187,7 +189,7 @@ onClicked: PkUpdates.installUpdates(selectedPackages()) } - BusyIndicator { + PlasmaComponents.BusyIndicator { running: PkUpdates.isActive visible: running anchors.horizontalCenter: parent.horizontalCenter --- a/src/plasma/contents/ui/PackageDelegate.qml +++ b/src/plasma/contents/ui/PackageDelegate.qml @@ -72,6 +72,7 @@ elide: Text.ElideRight; text: i18nc("Package Name (Version)", "%1 (%2)", name, version) } + PlasmaComponents.Label { id: packageDescriptionLabel height: paintedHeight