Hello community, here is the log from the commit of package libKF5NetworkManagerQt for openSUSE:Factory checked in at 2015-12-29 12:58:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old) and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libKF5NetworkManagerQt" Changes: -------- --- /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes 2015-11-24 22:25:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes 2015-12-29 12:58:13.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Dec 16 08:23:24 UTC 2015 - alarrosa@suse.com + +- Added 0001-make-it-work-with-older-NM-versions.patch committed also + upstream. This adds some #ifdefs around code that needs NM 0.9.10 + so it also builds with NM 0.9.8 + +------------------------------------------------------------------- +Thu Dec 10 23:11:43 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.17.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.17.0.php + +------------------------------------------------------------------- Old: ---- networkmanager-qt-5.16.0.tar.xz New: ---- 0001-make-it-work-with-older-NM-versions.patch networkmanager-qt-5.17.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libKF5NetworkManagerQt.spec ++++++ --- /var/tmp/diff_new_pack.XBO9y3/_old 2015-12-29 12:58:14.000000000 +0100 +++ /var/tmp/diff_new_pack.XBO9y3/_new 2015-12-29 12:58:14.000000000 +0100 @@ -17,9 +17,9 @@ %define soversion 6 -%define _tar_path 5.16 +%define _tar_path 5.17 Name: libKF5NetworkManagerQt -Version: 5.16.0 +Version: 5.17.0 Release: 0 Summary: A Qt wrapper for NetworkManager DBus API License: LGPL-2.1 or LGPL-3.0 @@ -27,6 +27,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/networkmanager-qt-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-make-it-work-with-older-NM-versions.patch -- Some missing #ifdefs to build with NM >= 0.9.8 +Patch0: 0001-make-it-work-with-older-NM-versions.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: kf5-filesystem @@ -73,6 +75,7 @@ %prep %setup -q -n networkmanager-qt-%{version} +%patch0 -p1 %build %cmake_kf5 -d build ++++++ 0001-make-it-work-with-older-NM-versions.patch ++++++
From 5f6d58672f7ac4a5bc392c817ac58b9ad0f7e64a Mon Sep 17 00:00:00 2001 From: Antonio Larrosa
Date: Wed, 16 Dec 2015 00:33:39 +0100 Subject: [PATCH] make it work with older NM versions
Added a couple of #ifdef NM_CHECK_VERSION(0, 9, 10) so it compiles with older NM versions that don't have *ConfigPath variables --- src/activeconnection.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp index 7a6c8dc..f29ca67 100644 --- a/src/activeconnection.cpp +++ b/src/activeconnection.cpp @@ -113,6 +113,7 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject Q_EMIT stateChanged(d->state); } +#if NM_CHECK_VERSION(0, 9, 10) QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config(); if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() != d->ipV4ConfigPath) { d->ipV4ConfigPath = ip4ConfigObjectPath.path(); @@ -136,6 +137,7 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path(); Q_EMIT dhcp6ConfigChanged(); } +#endif } NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, QObject *parent) @@ -154,6 +156,7 @@ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, Q_EMIT stateChanged(d->state); } +#if NM_CHECK_VERSION(0, 9, 10) QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config(); if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() != d->ipV4ConfigPath) { d->ipV4ConfigPath = ip4ConfigObjectPath.path(); @@ -177,6 +180,7 @@ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path(); Q_EMIT dhcp6ConfigChanged(); } +#endif } NetworkManager::ActiveConnection::~ActiveConnection() -- 2.6.2 ++++++ networkmanager-qt-5.16.0.tar.xz -> networkmanager-qt-5.17.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.16.0/CMakeLists.txt new/networkmanager-qt-5.17.0/CMakeLists.txt --- old/networkmanager-qt-5.16.0/CMakeLists.txt 2015-11-08 12:19:38.000000000 +0100 +++ new/networkmanager-qt-5.17.0/CMakeLists.txt 2015-12-06 15:59:59.000000000 +0100 @@ -3,7 +3,7 @@ project(NetworkManagerQt) include(FeatureSummary) -find_package(ECM 5.16.0 NO_MODULE) +find_package(ECM 5.17.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) @@ -32,7 +32,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.16.0") # handled by release scripts +set(KF5_VERSION "5.17.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX NETWORKMANAGERQT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/networkmanagerqt_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.16.0/src/activeconnection.cpp new/networkmanager-qt-5.17.0/src/activeconnection.cpp --- old/networkmanager-qt-5.16.0/src/activeconnection.cpp 2015-11-08 12:19:38.000000000 +0100 +++ new/networkmanager-qt-5.17.0/src/activeconnection.cpp 2015-12-06 15:59:59.000000000 +0100 @@ -103,6 +103,39 @@ Q_D(ActiveConnection); connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); + + /* + * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly + * BUG:352326 + */ + if (d->state != NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state())) { + d->state = NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state()); + Q_EMIT stateChanged(d->state); + } + + QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config(); + if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() != d->ipV4ConfigPath) { + d->ipV4ConfigPath = ip4ConfigObjectPath.path(); + Q_EMIT ipV4ConfigChanged(); + } + + QDBusObjectPath ip6ConfigObjectPath = d->iface.ip6Config(); + if (!ip6ConfigObjectPath.path().isNull() && ip6ConfigObjectPath.path() != d->ipV6ConfigPath) { + d->ipV6ConfigPath = ip6ConfigObjectPath.path(); + Q_EMIT ipV6ConfigChanged(); + } + + QDBusObjectPath dhcp4ConfigObjectPath = d->iface.dhcp4Config(); + if (!dhcp4ConfigObjectPath.path().isNull() && dhcp4ConfigObjectPath.path() != d->dhcp4ConfigPath) { + d->dhcp4ConfigPath = dhcp4ConfigObjectPath.path(); + Q_EMIT dhcp4ConfigChanged(); + } + + QDBusObjectPath dhcp6ConfigObjectPath = d->iface.dhcp6Config(); + if (!dhcp6ConfigObjectPath.path().isNull() && dhcp6ConfigObjectPath.path() != d->dhcp6ConfigPath) { + d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path(); + Q_EMIT dhcp6ConfigChanged(); + } } NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, QObject *parent) @@ -111,6 +144,39 @@ Q_D(ActiveConnection); connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); + + /* + * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly + * BUG:352326 + */ + if (d->state != NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state())) { + d->state = NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state()); + Q_EMIT stateChanged(d->state); + } + + QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config(); + if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() != d->ipV4ConfigPath) { + d->ipV4ConfigPath = ip4ConfigObjectPath.path(); + Q_EMIT ipV4ConfigChanged(); + } + + QDBusObjectPath ip6ConfigObjectPath = d->iface.ip6Config(); + if (!ip6ConfigObjectPath.path().isNull() && ip6ConfigObjectPath.path() != d->ipV6ConfigPath) { + d->ipV6ConfigPath = ip6ConfigObjectPath.path(); + Q_EMIT ipV6ConfigChanged(); + } + + QDBusObjectPath dhcp4ConfigObjectPath = d->iface.dhcp4Config(); + if (!dhcp4ConfigObjectPath.path().isNull() && dhcp4ConfigObjectPath.path() != d->dhcp4ConfigPath) { + d->dhcp4ConfigPath = dhcp4ConfigObjectPath.path(); + Q_EMIT dhcp4ConfigChanged(); + } + + QDBusObjectPath dhcp6ConfigObjectPath = d->iface.dhcp6Config(); + if (!dhcp6ConfigObjectPath.path().isNull() && dhcp6ConfigObjectPath.path() != d->dhcp6ConfigPath) { + d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path(); + Q_EMIT dhcp6ConfigChanged(); + } } NetworkManager::ActiveConnection::~ActiveConnection()