Hello community, here is the log from the commit of package libKF5NetworkManagerQt for openSUSE:Factory checked in at 2015-06-23 12:12:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-11 19:48:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes 2015-06-23 12:12:54.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jun 7 19:08:01 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.11.0 + * Drop WiMAX support for NM 1.2.0+ + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php + +------------------------------------------------------------------- Old: ---- networkmanager-qt-5.10.0.tar.xz New: ---- networkmanager-qt-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libKF5NetworkManagerQt.spec ++++++ --- /var/tmp/diff_new_pack.WvTAz1/_old 2015-06-23 12:12:54.000000000 +0200 +++ /var/tmp/diff_new_pack.WvTAz1/_new 2015-06-23 12:12:54.000000000 +0200 @@ -17,9 +17,9 @@ %define soversion 6 -%define _tar_path 5.10 +%define _tar_path 5.11 Name: libKF5NetworkManagerQt -Version: 5.10.0 +Version: 5.11.0 Release: 0 Summary: A Qt wrapper for NetworkManager DBus API License: LGPL-2.1 or LGPL-3.0 ++++++ networkmanager-qt-5.10.0.tar.xz -> networkmanager-qt-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/CMakeLists.txt new/networkmanager-qt-5.11.0/CMakeLists.txt --- old/networkmanager-qt-5.10.0/CMakeLists.txt 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/CMakeLists.txt 2015-06-06 11:34:53.000000000 +0200 @@ -2,7 +2,11 @@ project(NetworkManagerQt) -find_package(ECM 5.10.0 REQUIRED NO_MODULE) +include(FeatureSummary) +find_package(ECM 5.11.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) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -22,13 +26,13 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY) -include(FeatureSummary) + include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.10.0") # handled by release scripts +set(KF5_VERSION "5.11.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.10.0/autotests/managertest.cpp new/networkmanager-qt-5.11.0/autotests/managertest.cpp --- old/networkmanager-qt-5.10.0/autotests/managertest.cpp 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/autotests/managertest.cpp 2015-06-06 11:34:53.000000000 +0200 @@ -115,6 +115,7 @@ QVERIFY(wirelessHwEnabledChanged.at(0).at(0).toBool() == false); QCOMPARE(NetworkManager::isWirelessHardwareEnabled(), false); +#if !NM_CHECK_VERSION(1, 2, 0) QSignalSpy wimaxEnabledChanged(NetworkManager::notifier(), SIGNAL(wimaxEnabledChanged(bool))); QCOMPARE(NetworkManager::isWimaxEnabled(), true); fakeNetwork->setWimaxEnabled(false); @@ -130,6 +131,7 @@ QCOMPARE(wimaxHwEnabledChanged.count(), 1); QVERIFY(wimaxHwEnabledChanged.at(0).at(0).toBool() == false); QCOMPARE(NetworkManager::isWimaxHardwareEnabled(), false); +#endif QSignalSpy wwanEnabledChanged(NetworkManager::notifier(), SIGNAL(wwanEnabledChanged(bool))); QCOMPARE(NetworkManager::isWwanEnabled(), true); @@ -142,8 +144,10 @@ // We make it here, so we can set all values back for futher testing fakeNetwork->setWirelessEnabled(true); fakeNetwork->setWirelessHardwareEnabled(true); +#if !NM_CHECK_VERSION(1, 2, 0) fakeNetwork->setWimaxEnabled(true); fakeNetwork->setWimaxHardwareEnabled(true); +#endif fakeNetwork->setWwanEnabled(true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/src/CMakeLists.txt new/networkmanager-qt-5.11.0/src/CMakeLists.txt --- old/networkmanager-qt-5.10.0/src/CMakeLists.txt 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/src/CMakeLists.txt 2015-06-06 11:34:53.000000000 +0200 @@ -41,8 +41,6 @@ vlandevice.cpp vpnconnection.cpp vpnplugin.cpp - wimaxdevice.cpp - wimaxnsp.cpp wireddevice.cpp wirelessdevice.cpp wirelessnetwork.cpp @@ -50,11 +48,6 @@ ) set(NetworkManagerQt_SETTINGS_SRCS - settings/wiredsetting.cpp - settings/olpcmeshsetting.cpp - settings/wirelesssetting.cpp - settings/wirelesssecuritysetting.cpp - settings/security8021xsetting.cpp settings/adslsetting.cpp settings/bluetoothsetting.cpp settings/bondsetting.cpp @@ -66,14 +59,19 @@ settings/ipv4setting.cpp settings/ipv6setting.cpp settings/infinibandsetting.cpp + settings/olpcmeshsetting.cpp settings/pppsetting.cpp settings/pppoesetting.cpp settings/setting.cpp settings/serialsetting.cpp + settings/security8021xsetting.cpp #settings/template.cpp settings/vlansetting.cpp settings/vpnsetting.cpp settings/wimaxsetting.cpp + settings/wiredsetting.cpp + settings/wirelesssetting.cpp + settings/wirelesssecuritysetting.cpp ) set(DBUS_INTERFACE_SRCS @@ -90,7 +88,6 @@ dbus/nm-device-olpc-meshinterface.cpp dbus/nm-device-vlaninterface.cpp dbus/nm-device-wifiinterface.cpp - dbus/nm-device-wimaxinterface.cpp dbus/nm-deviceinterface.cpp dbus/nm-dhcp4-configinterface.cpp dbus/nm-dhcp6-configinterface.cpp @@ -104,9 +101,22 @@ dbus/nm-settingsinterface.cpp dbus/nm-vpn-connectioninterface.cpp dbus/nm-vpn-plugininterface.cpp - dbus/nm-wimax-nspinterface.cpp ) +if (${NETWORKMANAGER_VERSION} VERSION_LESS 1.2.0) + set(NetworkManagerQt_PART_SRCS + ${NetworkManagerQt_PART_SRCS} + wimaxdevice.cpp + wimaxnsp.cpp + ) + + set(DBUS_INTERFACE_SRCS + ${DBUS_INTERFACE_SRCS} + dbus/nm-device-wimaxinterface.cpp + dbus/nm-wimax-nspinterface.cpp + ) +endif() + if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 0.9.10.0 OR ${NETWORKMANAGER_VERSION} VERSION_GREATER 0.9.10.0) set(NetworkManagerQt_PART_SRCS ${NetworkManagerQt_PART_SRCS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/src/fakenetwork/fakenetwork.cpp new/networkmanager-qt-5.11.0/src/fakenetwork/fakenetwork.cpp --- old/networkmanager-qt-5.10.0/src/fakenetwork/fakenetwork.cpp 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/src/fakenetwork/fakenetwork.cpp 2015-06-06 11:34:53.000000000 +0200 @@ -36,8 +36,10 @@ , m_primaryConnection(QDBusObjectPath("/")) , m_state(20) , m_version(QLatin1Literal("0.9.10.0")) +#if !NM_CHECK_VERSION(1, 2, 0) , m_wimaxEnabled(true) , m_wimaxHardwareEnabled(true) +#endif , m_wirelessEnabled(true) , m_wirelessHardwareEnabled(true) , m_wwanEnabled(true) @@ -108,6 +110,7 @@ return m_version; } +#if !NM_CHECK_VERSION(1, 2, 0) bool FakeNetwork::wimaxEnabled() const { return m_wimaxEnabled; @@ -135,6 +138,7 @@ map.insert(QLatin1Literal("WimaxHardwareEnabled"), m_wimaxHardwareEnabled); Q_EMIT PropertiesChanged(map); } +#endif bool FakeNetwork::wirelessEnabled() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/src/fakenetwork/fakenetwork.h new/networkmanager-qt-5.11.0/src/fakenetwork/fakenetwork.h --- old/networkmanager-qt-5.10.0/src/fakenetwork/fakenetwork.h 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/src/fakenetwork/fakenetwork.h 2015-06-06 11:34:53.000000000 +0200 @@ -50,8 +50,10 @@ Q_PROPERTY(QDBusObjectPath PrimaryConnection READ primaryConnection) Q_PROPERTY(uint State READ state) Q_PROPERTY(QString Version READ version) +#if !NM_CHECK_VERSION(1, 2, 0) Q_PROPERTY(bool WimaxEnabled READ wimaxEnabled WRITE setWimaxEnabled) Q_PROPERTY(bool WimaxHardwareEnabled READ wimaxHardwareEnabled) +#endif Q_PROPERTY(bool WirelessEnabled READ wirelessEnabled WRITE setWirelessEnabled) Q_PROPERTY(bool WirelessHardwareEnabled READ wirelessHardwareEnabled) Q_PROPERTY(bool WwanEnabled READ wwanEnabled WRITE setWwanEnabled) @@ -65,10 +67,12 @@ QDBusObjectPath primaryConnection() const; uint state() const; QString version() const; +#if !NM_CHECK_VERSION(1, 2, 0) bool wimaxEnabled() const; void setWimaxEnabled(bool enabled); bool wimaxHardwareEnabled() const; void setWimaxHardwareEnabled(bool enabled); +#endif bool wirelessEnabled() const; void setWirelessEnabled(bool enabled); bool wirelessHardwareEnabled() const; @@ -110,8 +114,10 @@ QDBusObjectPath m_primaryConnection; uint m_state; QString m_version; +#if !NM_CHECK_VERSION(1, 2, 0) bool m_wimaxEnabled; bool m_wimaxHardwareEnabled; +#endif bool m_wirelessEnabled; bool m_wirelessHardwareEnabled; bool m_wwanEnabled; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/src/manager.cpp new/networkmanager-qt-5.11.0/src/manager.cpp --- old/networkmanager-qt-5.10.0/src/manager.cpp 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/src/manager.cpp 2015-06-06 11:34:53.000000000 +0200 @@ -48,7 +48,9 @@ #include "vlandevice.h" #include "wireddevice.h" #include "wirelessdevice.h" +#if !NM_CHECK_VERSION(1, 2, 0) #include "wimaxdevice.h" +#endif #include "nmdebug.h" @@ -78,8 +80,10 @@ , nmState(NetworkManager::Unknown) , m_connectivity(NetworkManager::UnknownConnectivity) , m_isNetworkingEnabled(false) +#if !NM_CHECK_VERSION(1, 2, 0) , m_isWimaxEnabled(false) , m_isWimaxHardwareEnabled(false) +#endif , m_isWirelessEnabled(false) , m_isWirelessHardwareEnabled(false) , m_isWwanEnabled(false) @@ -278,9 +282,11 @@ case Device::Bluetooth: createdInterface = Device::Ptr(new NetworkManager::BluetoothDevice(uni), &QObject::deleteLater); break; +#if !NM_CHECK_VERSION(1, 2, 0) case Device::Wimax: createdInterface = Device::Ptr(new NetworkManager::WimaxDevice(uni), &QObject::deleteLater); break; +#endif case Device::OlpcMesh: createdInterface = Device::Ptr(new NetworkManager::OlpcMeshDevice(uni), &QObject::deleteLater); break; @@ -375,6 +381,7 @@ return m_isWwanHardwareEnabled; } +#if !NM_CHECK_VERSION(1, 2, 0) bool NetworkManager::NetworkManagerPrivate::isWimaxEnabled() const { return m_isWimaxEnabled; @@ -384,6 +391,7 @@ { return m_isWimaxHardwareEnabled; } +#endif QDBusPendingReply<QDBusObjectPath> NetworkManager::NetworkManagerPrivate::activateConnection(const QString &connectionUni, const QString &interfaceUni, const QString &connectionParameter) { @@ -433,10 +441,12 @@ iface.setWwanEnabled(enabled); } +#if !NM_CHECK_VERSION(1, 2, 0) void NetworkManager::NetworkManagerPrivate::setWimaxEnabled(bool enabled) { iface.setWimaxEnabled(enabled); } +#endif void NetworkManager::NetworkManagerPrivate::sleep(bool sleep) { @@ -717,6 +727,7 @@ m_isWwanEnabled = it->toBool(); qCDebug(NMQT) << property << m_isWwanEnabled; Q_EMIT wwanEnabledChanged(m_isWwanEnabled); +#if !NM_CHECK_VERSION(1, 2, 0) } else if (property == QLatin1String("WimaxHardwareEnabled")) { m_isWimaxHardwareEnabled = it->toBool(); qCDebug(NMQT) << property << m_isWimaxHardwareEnabled; @@ -725,6 +736,7 @@ m_isWimaxEnabled = it->toBool(); qCDebug(NMQT) << property << m_isWimaxEnabled; Q_EMIT wimaxEnabledChanged(m_isWimaxEnabled); +#endif } else if (property == QLatin1String("Version")) { m_version = it->toString(); parseVersion(m_version); @@ -972,6 +984,7 @@ globalNetworkManager->setWwanEnabled(enabled); } +#if !NM_CHECK_VERSION(1, 2, 0) bool NetworkManager::isWimaxEnabled() { return globalNetworkManager->isWimaxEnabled(); @@ -986,6 +999,7 @@ { globalNetworkManager->setWimaxEnabled(enabled); } +#endif void NetworkManager::sleep(bool sleep) { @@ -1008,7 +1022,9 @@ NetworkManager::Device::Ethernet | NetworkManager::Device::Wifi | NetworkManager::Device::Modem | +#if !NM_CHECK_VERSION(1, 2, 0) NetworkManager::Device::Wimax | +#endif NetworkManager::Device::Bluetooth | NetworkManager::Device::OlpcMesh | NetworkManager::Device::InfiniBand | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/src/manager.h new/networkmanager-qt-5.11.0/src/manager.h --- old/networkmanager-qt-5.10.0/src/manager.h 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/src/manager.h 2015-06-06 11:34:53.000000000 +0200 @@ -116,10 +116,12 @@ * This signal is emitted when the status of the wireless changed */ void wwanEnabledChanged(bool); +#if !NM_CHECK_VERSION(1, 2, 0) /** * This signal is emitted when teh status of the wimax changed */ void wimaxEnabledChanged(bool); +#endif /** * This signal is emitted when the status of the wireless changed */ @@ -128,10 +130,12 @@ * This signal is emitted when the status of the wireless changed */ void wwanHardwareEnabledChanged(bool); +#if !NM_CHECK_VERSION(1, 2, 0) /** * This signal is emitted when the status of the wimax hardware changed */ void wimaxHardwareEnabledChanged(bool); +#endif /** * This signal is emitted when the status of overall networking changed */ @@ -267,6 +271,8 @@ * @return true if this broddband hardware is enabled, false otherwise */ NETWORKMANAGERQT_EXPORT bool isWwanHardwareEnabled(); + +#if !NM_CHECK_VERSION(1, 2, 0) /** * Retrieves the activation status of wimax networking in the system. * @@ -280,6 +286,8 @@ * @return true if wimax HW networking is enabled, false otherwise */ NETWORKMANAGERQT_EXPORT bool isWimaxHardwareEnabled(); +#endif + /** * Activate a connection using the supplied device. * @@ -389,7 +397,9 @@ // implemented in Notifier NETWORKMANAGERQT_EXPORT void setWirelessEnabled(bool enabled); NETWORKMANAGERQT_EXPORT void setWwanEnabled(bool enabled); +#if !NM_CHECK_VERSION(1, 2, 0) NETWORKMANAGERQT_EXPORT void setWimaxEnabled(bool enabled); +#endif NETWORKMANAGERQT_EXPORT void sleep(bool sleep); NETWORKMANAGERQT_EXPORT void setLogging(LogLevel, LogDomains); NETWORKMANAGERQT_EXPORT NMStringMap permissions(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/src/manager_p.h new/networkmanager-qt-5.11.0/src/manager_p.h --- old/networkmanager-qt-5.10.0/src/manager_p.h 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/src/manager_p.h 2015-06-06 11:34:53.000000000 +0200 @@ -53,8 +53,10 @@ NetworkManager::Status nmState; Connectivity m_connectivity; bool m_isNetworkingEnabled; +#if !NM_CHECK_VERSION(1, 2, 0) bool m_isWimaxEnabled; bool m_isWimaxHardwareEnabled; +#endif bool m_isWirelessEnabled; bool m_isWirelessHardwareEnabled; bool m_isWwanEnabled; @@ -90,8 +92,10 @@ bool isWirelessHardwareEnabled() const; bool isWwanEnabled() const; bool isWwanHardwareEnabled() const; +#if !NM_CHECK_VERSION(1, 2, 0) bool isWimaxEnabled() const; bool isWimaxHardwareEnabled() const; +#endif QDBusPendingReply<QDBusObjectPath> activateConnection(const QString &connectionUni, const QString &interfaceUni, const QString &connectionParameter); QDBusPendingReply<QDBusObjectPath, QDBusObjectPath> addAndActivateConnection(const NMVariantMapMap &connection, const QString &interfaceUni, const QString &connectionParameter); QDBusPendingReply<> deactivateConnection(const QString &activeConnection); @@ -101,7 +105,9 @@ void setNetworkingEnabled(bool enabled); void setWirelessEnabled(bool enabled); void setWwanEnabled(bool enabled); +#if !NM_CHECK_VERSION(1, 2, 0) void setWimaxEnabled(bool enabled); +#endif void sleep(bool sleep); void setLogging(NetworkManager::LogLevel, NetworkManager::LogDomains); NMStringMap permissions(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.10.0/src/settings/connectionsettings.cpp new/networkmanager-qt-5.11.0/src/settings/connectionsettings.cpp --- old/networkmanager-qt-5.10.0/src/settings/connectionsettings.cpp 2015-05-01 17:25:36.000000000 +0200 +++ new/networkmanager-qt-5.11.0/src/settings/connectionsettings.cpp 2015-06-06 11:34:53.000000000 +0200 @@ -132,13 +132,17 @@ case ConnectionSettings::Cdma: addSetting(Setting::Ptr(new CdmaSetting())); addSetting(Setting::Ptr(new Ipv4Setting())); - //addSetting(Setting::Ptr(new Ipv6Setting())); +#if NM_CHECK_VERSION(1, 0, 0) + addSetting(Setting::Ptr(new Ipv6Setting())); +#endif addSetting(Setting::Ptr(new PppSetting())); break; case ConnectionSettings::Gsm: addSetting(Setting::Ptr(new GsmSetting())); addSetting(Setting::Ptr(new Ipv4Setting())); - //addSetting(Setting::Ptr(new Ipv6Setting())); +#if NM_CHECK_VERSION(1, 0, 0) + addSetting(Setting::Ptr(new Ipv6Setting())); +#endif addSetting(Setting::Ptr(new PppSetting())); break; case ConnectionSettings::Infiniband: @@ -224,7 +228,9 @@ case ConnectionSettings::Bluetooth: addSetting(connectionSettings->setting(Setting::Bluetooth)); addSetting(connectionSettings->setting(Setting::Ipv4)); - //addSetting(connectionSettings->setting(Setting::Ipv6)); +#if NM_CHECK_VERSION(1, 0, 0) + addSetting(connectionSettings->setting(Setting::Ipv6)); +#endif if (q->setting(Setting::Gsm) && q->setting(Setting::Ppp) && q->setting(Setting::Serial)) { addSetting(connectionSettings->setting(Setting::Gsm)); addSetting(connectionSettings->setting(Setting::Ppp)); @@ -239,13 +245,17 @@ case ConnectionSettings::Cdma: addSetting(connectionSettings->setting(Setting::Cdma)); addSetting(connectionSettings->setting(Setting::Ipv4)); - //addSetting(connectionSettings->setting(Setting::Ipv6)); +#if NM_CHECK_VERSION(1, 0, 0) + addSetting(connectionSettings->setting(Setting::Ipv6)); +#endif addSetting(connectionSettings->setting(Setting::Ppp)); break; case ConnectionSettings::Gsm: addSetting(connectionSettings->setting(Setting::Gsm)); addSetting(connectionSettings->setting(Setting::Ipv4)); - //addSetting(connectionSettings->setting(Setting::Ipv6)); +#if NM_CHECK_VERSION(1, 0, 0) + addSetting(connectionSettings->setting(Setting::Ipv6)); +#endif addSetting(connectionSettings->setting(Setting::Ppp)); break; case ConnectionSettings::Infiniband: