Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2017-06-01 16:22:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Thu Jun 1 16:22:12 2017 rev:38 rq:495077 version:5.34.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2017-04-30 21:22:06.499839144 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2017-06-01 16:22:13.424047642 +0200
@@ -1,0 +2,16 @@
+Mon May 15 13:53:11 CEST 2017 - [email protected]
+
+- Update to 5.34.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.34.0.php
+- Changes since 5.33.0:
+ * Fix crash when retrieving active connection list. (kde#373993)
+ * -Wheader-guard
+ * -Wheader-guard
+ * Fix unit test
+ * Set default value for auto-negotiation based on running NM version
+ * One more attempt to fix unit test for active connections
+ * Fix unit test for active connections
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.33.0.tar.xz
New:
----
networkmanager-qt-5.34.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.H7o5Q2/_old 2017-06-01 16:22:14.059957973 +0200
+++ /var/tmp/diff_new_pack.H7o5Q2/_new 2017-06-01 16:22:14.063957408 +0200
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.33
+%define _tar_path 5.34
Name: libKF5NetworkManagerQt
-Version: 5.33.0
+Version: 5.34.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
++++++ networkmanager-qt-5.33.0.tar.xz -> networkmanager-qt-5.34.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.33.0/CMakeLists.txt
new/networkmanager-qt-5.34.0/CMakeLists.txt
--- old/networkmanager-qt-5.33.0/CMakeLists.txt 2017-04-01 20:47:30.000000000
+0200
+++ new/networkmanager-qt-5.34.0/CMakeLists.txt 2017-05-06 10:54:38.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.33.0") # handled by release scripts
+set(KF5_VERSION "5.34.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.33.0 NO_MODULE)
+find_package(ECM 5.34.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.33.0/autotests/activeconnectiontest.h
new/networkmanager-qt-5.34.0/autotests/activeconnectiontest.h
--- old/networkmanager-qt-5.33.0/autotests/activeconnectiontest.h
2017-04-01 20:47:30.000000000 +0200
+++ new/networkmanager-qt-5.34.0/autotests/activeconnectiontest.h
2017-05-06 10:54:38.000000000 +0200
@@ -19,7 +19,7 @@
*/
#ifndef NETWORKMANAGERQT_ACTIVE_CONNECTION_TEST_H
-#define NETWORKMANAGERQT_ACTIVE_CONNECTIOn_TEST_H
+#define NETWORKMANAGERQT_ACTIVE_CONNECTION_TEST_H
#include <QObject>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.33.0/autotests/settingstest.cpp
new/networkmanager-qt-5.34.0/autotests/settingstest.cpp
--- old/networkmanager-qt-5.33.0/autotests/settingstest.cpp 2017-04-01
20:47:30.000000000 +0200
+++ new/networkmanager-qt-5.34.0/autotests/settingstest.cpp 2017-05-06
10:54:38.000000000 +0200
@@ -51,7 +51,9 @@
NetworkManager::WiredSetting::Ptr wiredSetting =
connectionSettings->setting(NetworkManager::Setting::Wired).dynamicCast<NetworkManager::WiredSetting>();
wiredSetting->setInitialized(true);
// Something needs to be set to not use default values, when using default
values we get an empty map
+ wiredSetting->setAutoNegotiate(false);
wiredSetting->setSpeed(100);
+ wiredSetting->setDuplexType(NetworkManager::WiredSetting::Full);
NetworkManager::addConnection(connectionSettings->toMap());
connect(NetworkManager::settingsNotifier(),
&NetworkManager::SettingsNotifier::connectionAdded, this,
&SettingsTest::testConnectionAdded);
@@ -83,13 +85,17 @@
NetworkManager::Ipv6Setting::Ptr ipv6Setting =
connectionSettings->setting(NetworkManager::Setting::Ipv6).dynamicCast<NetworkManager::Ipv6Setting>();
QCOMPARE(ipv6Setting->method(), NetworkManager::Ipv6Setting::Automatic);
NetworkManager::WiredSetting::Ptr wiredSetting =
connectionSettings->setting(NetworkManager::Setting::Wired).dynamicCast<NetworkManager::WiredSetting>();
+ QVERIFY(wiredSetting->autoNegotiate() == false);
QVERIFY(wiredSetting->speed() == 100);
+ QVERIFY(wiredSetting->duplexType() == NetworkManager::WiredSetting::Full);
wiredSetting->setSpeed(10);
+ wiredSetting->setDuplexType(NetworkManager::WiredSetting::Half);
addedConnection->update(connectionSettings->toMap());
QSignalSpy connectionUpdatedSpy(addedConnection.data(), SIGNAL(updated()));
QVERIFY(connectionUpdatedSpy.wait());
QVERIFY(wiredSetting->speed() == 10);
+ QVERIFY(wiredSetting->duplexType() == NetworkManager::WiredSetting::Half);
}
QTEST_MAIN(SettingsTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.33.0/src/activeconnection.cpp
new/networkmanager-qt-5.34.0/src/activeconnection.cpp
--- old/networkmanager-qt-5.33.0/src/activeconnection.cpp 2017-04-01
20:47:30.000000000 +0200
+++ new/networkmanager-qt-5.34.0/src/activeconnection.cpp 2017-05-06
10:54:38.000000000 +0200
@@ -79,11 +79,13 @@
connect(&d->iface,
&OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d,
&ActiveConnectionPrivate::propertiesChanged);
#endif
+#ifndef NMQT_STATIC
/*
* Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
* BUG:352326
*/
d->recheckProperties();
+#endif
}
NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate
&dd, QObject *parent)
@@ -91,18 +93,26 @@
{
Q_D(ActiveConnection);
+#ifndef NMQT_STATIC
#if NM_CHECK_VERSION(1, 4, 0)
QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
QLatin1String("PropertiesChanged"),
d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList)));
#else
connect(&d->iface,
&OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d,
&ActiveConnectionPrivate::propertiesChanged);
#endif
+#endif
+
+#ifdef NMQT_STATIC
+ connect(&d->iface,
&OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d,
&ActiveConnectionPrivate::propertiesChanged);
+#endif
+#ifndef NMQT_STATIC
/*
* Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
* BUG:352326
*/
d->recheckProperties();
+#endif
}
NetworkManager::ActiveConnection::~ActiveConnection()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.33.0/src/fakenetwork/fakenetwork.cpp
new/networkmanager-qt-5.34.0/src/fakenetwork/fakenetwork.cpp
--- old/networkmanager-qt-5.33.0/src/fakenetwork/fakenetwork.cpp
2017-04-01 20:47:30.000000000 +0200
+++ new/networkmanager-qt-5.34.0/src/fakenetwork/fakenetwork.cpp
2017-05-06 10:54:38.000000000 +0200
@@ -215,8 +215,14 @@
QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath
&connection, const QDBusObjectPath &device, const QDBusObjectPath
&specific_object)
{
- ActiveConnection *newActiveConnection = new ActiveConnection(this);
QString newActiveConnectionPath =
QString("/org/kde/fakenetwork/ActiveConnection/") +
QString::number(m_activeConnectionsCounter++);
+ ActiveConnection *newActiveConnection = new ActiveConnection(this);
+ newActiveConnection->addDevice(device);
+ newActiveConnection->setActiveConnectionPath(newActiveConnectionPath);
+ newActiveConnection->setConnection(connection);
+ newActiveConnection->setSpecificObject(specific_object);
+
newActiveConnection->setState(NetworkManager::ActiveConnection::Activating);
+
m_activeConnections.insert(QDBusObjectPath(newActiveConnectionPath),
newActiveConnection);
QDBusConnection::sessionBus().registerObject(newActiveConnectionPath,
newActiveConnection, QDBusConnection::ExportScriptableContents);
@@ -227,24 +233,6 @@
map.insert(QLatin1Literal("ActivatingConnection"),
QVariant::fromValue(QDBusObjectPath(newActiveConnectionPath)));
Q_EMIT PropertiesChanged(map);
- newActiveConnection->addDevice(device);
- newActiveConnection->setActiveConnectionPath(newActiveConnectionPath);
- newActiveConnection->setConnection(connection);
- newActiveConnection->setSpecificObject(specific_object);
-
newActiveConnection->setState(NetworkManager::ActiveConnection::Activating);
-
- map.clear();
- const QList<QDBusObjectPath> deviceList { device };
- map.insert(QLatin1Literal("Devices"),
QVariant::fromValue<QList<QDBusObjectPath> >(deviceList));
- map.insert(QLatin1Literal("Connection"),
QVariant::fromValue<QDBusObjectPath>(connection));
- if (!specific_object.path().isEmpty()) {
- map.insert(QLatin1Literal("SpecificObject"),
QVariant::fromValue<QDBusObjectPath>(connection));
- }
- map.insert(QLatin1Literal("State"),
NetworkManager::ActiveConnection::Activating);
- QDBusMessage message = QDBusMessage::createSignal(newActiveConnectionPath,
QLatin1Literal("org.kde.fakenetwork.Connection.Active"),
QLatin1Literal("PropertiesChanged"));
- message << map;
- QDBusConnection::sessionBus().send(message);
-
Device *usedDevice = static_cast<Device
*>(QDBusConnection::sessionBus().objectRegisteredAt(device.path()));
if (usedDevice) {
m_activatedDevice = usedDevice->devicePath();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.33.0/src/fakenetwork/wirelessdevice.h
new/networkmanager-qt-5.34.0/src/fakenetwork/wirelessdevice.h
--- old/networkmanager-qt-5.33.0/src/fakenetwork/wirelessdevice.h
2017-04-01 20:47:30.000000000 +0200
+++ new/networkmanager-qt-5.34.0/src/fakenetwork/wirelessdevice.h
2017-05-06 10:54:38.000000000 +0200
@@ -19,7 +19,7 @@
*/
#ifndef NETWORKMANAGERQT_FAKE_NETWORK_WIRELESS_DEVICE_H
-#define NETWORKMANAGERQT_FAKE_NETWORK_WIRELESSWo_DEVICE_H
+#define NETWORKMANAGERQT_FAKE_NETWORK_WIRELESS_DEVICE_H
#include <QObject>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.33.0/src/manager.cpp
new/networkmanager-qt-5.34.0/src/manager.cpp
--- old/networkmanager-qt-5.33.0/src/manager.cpp 2017-04-01
20:47:30.000000000 +0200
+++ new/networkmanager-qt-5.34.0/src/manager.cpp 2017-05-06
10:54:38.000000000 +0200
@@ -895,13 +895,15 @@
NetworkManager::ActiveConnection::List
NetworkManager::NetworkManagerPrivate::activeConnections()
{
NetworkManager::ActiveConnection::List list;
- QMap<QString, ActiveConnection::Ptr>::const_iterator it =
m_activeConnections.constBegin();
- while (it != m_activeConnections.constEnd()) {
- NetworkManager::ActiveConnection::Ptr activeConnection =
findRegisteredActiveConnection(it.key());
+
+ // We do not use const_iterator here because
+ // findRegisteredActiveConnection() changes m_activeConnections.
+ foreach (const QString &key, m_activeConnections.keys()) {
+ NetworkManager::ActiveConnection::Ptr activeConnection =
findRegisteredActiveConnection(key);
+
if (activeConnection) {
list << activeConnection;
}
- ++it;
}
return list;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.33.0/src/settings/wiredsetting.cpp
new/networkmanager-qt-5.34.0/src/settings/wiredsetting.cpp
--- old/networkmanager-qt-5.33.0/src/settings/wiredsetting.cpp 2017-04-01
20:47:30.000000000 +0200
+++ new/networkmanager-qt-5.34.0/src/settings/wiredsetting.cpp 2017-05-06
10:54:38.000000000 +0200
@@ -20,6 +20,7 @@
#include "wiredsetting.h"
#include "wiredsetting_p.h"
+#include "manager.h"
#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-wired.h>
@@ -32,10 +33,16 @@
, port(NetworkManager::WiredSetting::UnknownPort)
, speed(0)
, duplex(NetworkManager::WiredSetting::UnknownDuplexType)
- , autoNegotiate(false)
+ // , autonegotiate(false)
, mtu(0)
, s390NetType(NetworkManager::WiredSetting::Undefined)
-{ }
+{
+ if (NetworkManager::checkVersion(1, 6, 0)) {
+ autoNegotiate = false;
+ } else {
+ autoNegotiate = true;
+ }
+}
NetworkManager::WiredSetting::WiredSetting()
: Setting(Setting::Wired)
