Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for openSUSE:Factory checked in at 2017-04-30 21:22:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Sun Apr 30 21:22:05 2017 rev:37 rq:492098 version:5.33.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes 2017-03-28 15:13:14.697858845 +0200
+++ /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes 2017-04-30 21:22:06.499839144 +0200
@@ -1,0 +2,16 @@
+Sat Apr 15 10:11:58 CEST 2017 - lbeltrame@kde.org
+
+- Update to 5.33.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.33.0.php
+- Changes since 5.32.0:
+ * Upgrade ECM and KF5 version requirements for 5.33.0 release.
+ * WiredSetting: return autonegotiate even when it's disabled
+ * Prevent signals in glib2 be defined by Qt
+ * prevent signals in glib2 be defined by Qt
+ * WiredSetting: Speed and duplex can be set only when auto-negotiation is off
+ * Auto-negotiate value for wired setting should be false
+ * Upgrade KF5 version to 5.33.0.
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.32.0.tar.xz
New:
----
networkmanager-qt-5.33.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.uJJe3v/_old 2017-04-30 21:22:07.407711135 +0200
+++ /var/tmp/diff_new_pack.uJJe3v/_new 2017-04-30 21:22:07.415710008 +0200
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.32
+%define _tar_path 5.33
Name: libKF5NetworkManagerQt
-Version: 5.32.0
+Version: 5.33.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
++++++ networkmanager-qt-5.32.0.tar.xz -> networkmanager-qt-5.33.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/CMakeLists.txt new/networkmanager-qt-5.33.0/CMakeLists.txt
--- old/networkmanager-qt-5.32.0/CMakeLists.txt 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/CMakeLists.txt 2017-04-01 20:47:30.000000000 +0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.32.0") # handled by release scripts
+set(KF5_VERSION "5.33.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.32.0 NO_MODULE)
+find_package(ECM 5.33.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.32.0/src/connection.cpp new/networkmanager-qt-5.33.0/src/connection.cpp
--- old/networkmanager-qt-5.32.0/src/connection.cpp 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/connection.cpp 2017-04-01 20:47:30.000000000 +0200
@@ -23,6 +23,7 @@
#include "connection_p.h"
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
@@ -39,6 +40,7 @@
#include
#include
#endif
+#define signals Q_SIGNALS
#include <QDBusConnection>
#include <QDBusPendingReply>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/ipconfig.h new/networkmanager-qt-5.33.0/src/ipconfig.h
--- old/networkmanager-qt-5.32.0/src/ipconfig.h 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/ipconfig.h 2017-04-01 20:47:30.000000000 +0200
@@ -26,12 +26,15 @@
#include "ipaddress.h"
#include "iproute.h"
+// To prevent signals in glib2 be defined by QT
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
#else
#include
#endif
+#define signals Q_SIGNALS
#include
#include <QNetworkAddressEntry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/manager.cpp new/networkmanager-qt-5.33.0/src/manager.cpp
--- old/networkmanager-qt-5.32.0/src/manager.cpp 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/manager.cpp 2017-04-01 20:47:30.000000000 +0200
@@ -26,12 +26,14 @@
#include "macros.h"
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
#else
#include
#endif
+#define signals Q_SIGNALS
#include "activeconnection.h"
#include "adsldevice.h"
@@ -110,7 +112,7 @@
connect(&iface, &OrgFreedesktopNetworkManagerInterface::PropertiesChanged,
this, &NetworkManagerPrivate::propertiesChanged);
#endif
-
+
connect(&watcher, &QDBusServiceWatcher::serviceRegistered,
this, &NetworkManagerPrivate::daemonRegistered);
connect(&watcher, &QDBusServiceWatcher::serviceUnregistered,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/secretagent.cpp new/networkmanager-qt-5.33.0/src/secretagent.cpp
--- old/networkmanager-qt-5.32.0/src/secretagent.cpp 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/secretagent.cpp 2017-04-01 20:47:30.000000000 +0200
@@ -23,11 +23,13 @@
#include "manager_p.h"
#include "nmdebug.h"
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
#include
#endif
+#define signals Q_SIGNALS
#include <QDBusArgument>
#include <QDBusConnection>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/settings/connectionsettings.cpp new/networkmanager-qt-5.33.0/src/settings/connectionsettings.cpp
--- old/networkmanager-qt-5.32.0/src/settings/connectionsettings.cpp 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/settings/connectionsettings.cpp 2017-04-01 20:47:30.000000000 +0200
@@ -45,6 +45,7 @@
#include "vpnsetting.h"
#include "wimaxsetting.h"
+#undef signals
#if NM_CHECK_VERSION(1, 0, 0)
#include
#else
@@ -65,6 +66,7 @@
#include
#include
#include
+#define signals Q_SIGNALS
#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY "autoconnect-priority"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/settings/connectionsettings.h new/networkmanager-qt-5.33.0/src/settings/connectionsettings.h
--- old/networkmanager-qt-5.32.0/src/settings/connectionsettings.h 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/settings/connectionsettings.h 2017-04-01 20:47:30.000000000 +0200
@@ -25,12 +25,14 @@
#include
#include "setting.h"
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
#else
#include
#endif
+#define signals Q_SIGNALS
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/settings/setting.cpp new/networkmanager-qt-5.33.0/src/settings/setting.cpp
--- old/networkmanager-qt-5.32.0/src/settings/setting.cpp 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/settings/setting.cpp 2017-04-01 20:47:30.000000000 +0200
@@ -20,6 +20,7 @@
#include "setting.h"
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
@@ -47,6 +48,7 @@
#include
#include
#endif
+#define signals Q_SIGNALS
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/settings/setting.h new/networkmanager-qt-5.33.0/src/settings/setting.h
--- old/networkmanager-qt-5.32.0/src/settings/setting.h 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/settings/setting.h 2017-04-01 20:47:30.000000000 +0200
@@ -25,10 +25,12 @@
#include "generictypes.h"
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
#endif
+#define signals Q_SIGNALS
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/settings/wiredsetting.cpp new/networkmanager-qt-5.33.0/src/settings/wiredsetting.cpp
--- old/networkmanager-qt-5.32.0/src/settings/wiredsetting.cpp 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/settings/wiredsetting.cpp 2017-04-01 20:47:30.000000000 +0200
@@ -32,7 +32,7 @@
, port(NetworkManager::WiredSetting::UnknownPort)
, speed(0)
, duplex(NetworkManager::WiredSetting::UnknownDuplexType)
- , autoNegotiate(true)
+ , autoNegotiate(false)
, mtu(0)
, s390NetType(NetworkManager::WiredSetting::Undefined)
{ }
@@ -324,23 +324,24 @@
break;
}
- if (speed()) {
+ // When autonegotiation is set we have to avoid setting speed and duplex, while
+ // when autonegotiation is disabled, we have to specify both
+ if (autoNegotiate()) {
+ setting.insert(QLatin1String(NM_SETTING_WIRED_AUTO_NEGOTIATE), autoNegotiate());
+ } else {
+ setting.insert(QLatin1String(NM_SETTING_WIRED_AUTO_NEGOTIATE), autoNegotiate());
setting.insert(QLatin1String(NM_SETTING_WIRED_SPEED), speed());
- }
-
- switch (duplexType()) {
- case Half:
- setting.insert(QLatin1String(NM_SETTING_WIRED_DUPLEX), "half");
- break;
- case Full:
- setting.insert(QLatin1String(NM_SETTING_WIRED_DUPLEX), "full");
- break;
- case UnknownDuplexType:
- break;
- }
- if (!autoNegotiate()) {
- setting.insert(QLatin1String(NM_SETTING_WIRED_AUTO_NEGOTIATE), autoNegotiate());
+ switch (duplexType()) {
+ case Half:
+ setting.insert(QLatin1String(NM_SETTING_WIRED_DUPLEX), "half");
+ break;
+ case Full:
+ setting.insert(QLatin1String(NM_SETTING_WIRED_DUPLEX), "full");
+ break;
+ case UnknownDuplexType:
+ break;
+ }
}
if (!macAddress().isEmpty()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.32.0/src/wirelessdevice.cpp new/networkmanager-qt-5.33.0/src/wirelessdevice.cpp
--- old/networkmanager-qt-5.32.0/src/wirelessdevice.cpp 2017-03-03 14:12:54.000000000 +0100
+++ new/networkmanager-qt-5.33.0/src/wirelessdevice.cpp 2017-04-01 20:47:30.000000000 +0200
@@ -23,12 +23,14 @@
#include "wirelessdevice.h"
#include "wirelessdevice_p.h"
+#undef signals
#include
#if NM_CHECK_VERSION(1, 0, 0)
#include
#else
#include
#endif
+#define signals Q_SIGNALS
#include "accesspoint.h"
#include "manager_p.h"
@@ -74,11 +76,11 @@
connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::PropertiesChanged, d, &WirelessDevicePrivate::propertiesChanged);
#endif
#endif
-
+
#ifdef NMQT_STATIC
connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::PropertiesChanged, d, &WirelessDevicePrivate::propertiesChanged);
#endif
-
+
connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointAdded, d, &WirelessDevicePrivate::accessPointAdded);
connect(&d->wirelessIface, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointRemoved, d, &WirelessDevicePrivate::accessPointRemoved);
}
