Hello community, here is the log from the commit of package plasma-nm5 for openSUSE:Factory checked in at 2018-10-29 14:19:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-nm5 (Old) and /work/SRC/openSUSE:Factory/.plasma-nm5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-nm5" Mon Oct 29 14:19:40 2018 rev:81 rq:644063 version:5.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-nm5/plasma-nm5.changes 2018-10-22 11:21:25.239272676 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-nm5.new/plasma-nm5.changes 2018-10-29 14:20:41.682385283 +0100 @@ -1,0 +2,12 @@ +Tue Oct 23 13:56:32 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.14.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.14.2.php +- Changes since 5.14.1: + * Show correct current download and upload speed +- Revert yet another commit for 42.3: + * 0001-Revert-Show-correct-current-download-and-upload-spee.patch + +------------------------------------------------------------------- Old: ---- plasma-nm-5.14.1.tar.xz plasma-nm-5.14.1.tar.xz.sig New: ---- 0001-Revert-Show-correct-current-download-and-upload-spee.patch plasma-nm-5.14.2.tar.xz plasma-nm-5.14.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-nm5.spec ++++++ --- /var/tmp/diff_new_pack.IUTM0i/_old 2018-10-29 14:20:42.458402546 +0100 +++ /var/tmp/diff_new_pack.IUTM0i/_new 2018-10-29 14:20:42.458402546 +0100 @@ -19,21 +19,21 @@ %bcond_without lang %define mm_support 1 Name: plasma-nm5 -Version: 5.14.1 +Version: 5.14.2 Release: 0 Summary: Plasma applet written in QML for managing network connections License: (LGPL-2.1-only OR LGPL-3.0-only) AND (GPL-2.0-only OR GPL-3.0-only) Group: System/GUI/KDE URL: http://www.kde.org -Source: https://download.kde.org/stable/plasma/5.14.1/plasma-nm-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/%{version}/plasma-nm-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/5.14.1/plasma-nm-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/%{version}/plasma-nm-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE -Patch0: 0001-Revert-Require-NM-1.4.0-and-newer.patch -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Use-NetworkManager-DeviceStatistics-instead-o.patch +Patch0: 0001-Revert-Show-correct-current-download-and-upload-spee.patch +Patch1: 0001-Revert-Require-NM-1.4.0-and-newer.patch +Patch2: 0001-Revert-Use-NetworkManager-DeviceStatistics-instead-o.patch BuildRequires: NetworkManager-devel >= 0.9.8.4 BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes @@ -83,7 +83,7 @@ Obsoletes: plasma-nm < %{version} %endif %if 0%{?mm_support} -BuildRequires: cmake(KF5ModemManagerQt) >= 5.14.1 +BuildRequires: cmake(KF5ModemManagerQt) >= 5.14.2 BuildRequires: pkgconfig(ModemManager) >= 1.0.0 %endif Obsoletes: NetworkManager-kde4-devel ++++++ 0001-Revert-Show-correct-current-download-and-upload-spee.patch ++++++ >From 0429d11739927bfbe9bb7c7ec1fb34c64aeb22f8 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Tue, 23 Oct 2018 16:28:16 +0200 Subject: [PATCH] Revert "Show correct current download and upload speed" This reverts commit c5593b02df3864fe7a720925492306734d0b94e6. --- applet/contents/ui/ConnectionItem.qml | 26 ++------------------------ libs/models/networkmodel.cpp | 6 ------ 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/applet/contents/ui/ConnectionItem.qml b/applet/contents/ui/ConnectionItem.qml index cb3c582b..3e5af365 100644 --- a/applet/contents/ui/ConnectionItem.qml +++ b/applet/contents/ui/ConnectionItem.qml @@ -43,9 +43,6 @@ PlasmaComponents.ListItem { property bool visibleDetails: false property bool visiblePasswordDialog: false - property real rxBytes: 0 - property real txBytes: 0 - checked: connectionItem.containsMouse enabled: true height: expanded ? baseHeight + separator.height + expandableComponentLoader.height + (2 * Math.round(units.gridUnit / 3)) : baseHeight @@ -235,25 +232,6 @@ PlasmaComponents.ListItem { } } - Timer { - id: timer - repeat: true - interval: 2000 - running: showSpeed - property real prevRxBytes - property real prevTxBytes - Component.onCompleted: { - prevRxBytes = RxBytes - prevTxBytes = TxBytes - } - onTriggered: { - rxBytes = (RxBytes - prevRxBytes) * 1000 / interval - txBytes = (TxBytes - prevTxBytes) * 1000 / interval - prevRxBytes = RxBytes - prevTxBytes = TxBytes - } - } - states: [ State { name: "collapsed" @@ -333,9 +311,9 @@ PlasmaComponents.ListItem { return i18n("Connected, <font color='%1'>⬇</font> %2, <font color='%3'>⬆</font> %4", downloadColor, - KCoreAddons.Format.formatByteSize(rxBytes), + KCoreAddons.Format.formatByteSize(RxBytes), uploadColor, - KCoreAddons.Format.formatByteSize(txBytes)) + KCoreAddons.Format.formatByteSize(TxBytes)) } else { return i18n("Connected") } diff --git a/libs/models/networkmodel.cpp b/libs/models/networkmodel.cpp index d6215d73..e4b0f73e 100644 --- a/libs/models/networkmodel.cpp +++ b/libs/models/networkmodel.cpp @@ -300,12 +300,6 @@ void NetworkModel::addActiveConnection(const NetworkManager::ActiveConnection::P } item->invalidateDetails(); qCDebug(PLASMA_NM) << "Item " << item->name() << ": active connection state changed to " << item->connectionState(); - - if (device && device->uni() == item->devicePath()) { - auto deviceStatistics = device->deviceStatistics(); - item->setRxBytes(deviceStatistics->rxBytes()); - item->setTxBytes(deviceStatistics->txBytes()); - } } } endResetModel(); -- 2.19.0 ++++++ plasma-nm-5.14.1.tar.xz -> plasma-nm-5.14.2.tar.xz ++++++ ++++ 2817 lines of diff (skipped)
