Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2017-08-24 17:59:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Thu Aug 24 17:59:29 2017 rev:41 rq:516708 version:5.37.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2017-07-17 10:26:38.769843159 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2017-08-24 17:59:33.335943986 +0200
@@ -1,0 +2,13 @@
+Sat Aug 12 09:23:42 UTC 2017 - [email protected]
+
+- Update to 5.37.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.37.0.php
+- Changes since 5.36.0 :
+ * Adding support to ipv*.route-metric
+ * Fix undefined NM_SETTING_WIRELESS_POWERSAVE_FOO enums (kde#382051)
+ * Add .arcconfig
+- Drop Fix-undefined-enums.patch (merged upstream)
+
+-------------------------------------------------------------------
Old:
----
Fix-undefined-enums.patch
networkmanager-qt-5.36.0.tar.xz
New:
----
networkmanager-qt-5.37.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.Ith8kh/_old 2017-08-24 17:59:35.843590787 +0200
+++ /var/tmp/diff_new_pack.Ith8kh/_new 2017-08-24 17:59:35.855589097 +0200
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.36
+%define _tar_path 5.37
Name: libKF5NetworkManagerQt
-Version: 5.36.0
+Version: 5.37.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
@@ -27,8 +27,6 @@
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
-Patch: Fix-undefined-enums.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: kf5-filesystem
@@ -75,7 +73,6 @@
%prep
%setup -q -n networkmanager-qt-%{version}
-%patch -p1
%build
%cmake_kf5 -d build
++++++ networkmanager-qt-5.36.0.tar.xz -> networkmanager-qt-5.37.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.36.0/.arcconfig
new/networkmanager-qt-5.37.0/.arcconfig
--- old/networkmanager-qt-5.36.0/.arcconfig 1970-01-01 01:00:00.000000000
+0100
+++ new/networkmanager-qt-5.37.0/.arcconfig 2017-08-06 18:58:32.000000000
+0200
@@ -0,0 +1,3 @@
+{
+ "phabricator.uri" : "https://phabricator.kde.org/";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.36.0/CMakeLists.txt
new/networkmanager-qt-5.37.0/CMakeLists.txt
--- old/networkmanager-qt-5.36.0/CMakeLists.txt 2017-06-30 23:57:43.000000000
+0200
+++ new/networkmanager-qt-5.37.0/CMakeLists.txt 2017-08-06 18:58:32.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.36.0") # handled by release scripts
+set(KF5_VERSION "5.37.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.36.0 NO_MODULE)
+find_package(ECM 5.37.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)
@@ -17,7 +17,7 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.6.0)
+set(REQUIRED_QT_VERSION 5.7.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Network)
add_definitions(${QT_DEFINITIONS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.36.0/TODO
new/networkmanager-qt-5.37.0/TODO
--- old/networkmanager-qt-5.36.0/TODO 2017-06-30 23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/TODO 2017-08-06 18:58:32.000000000 +0200
@@ -79,7 +79,6 @@
- dns-options
- dns-priority
- route-data
- - route-metric
- ipv6 setting
-----------------
@@ -90,5 +89,4 @@
- dhcp-fqdn
- dns-options
- route-data
- - route-metrics
- token
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.36.0/autotests/settings/ipv4settingtest.cpp
new/networkmanager-qt-5.37.0/autotests/settings/ipv4settingtest.cpp
--- old/networkmanager-qt-5.36.0/autotests/settings/ipv4settingtest.cpp
2017-06-30 23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/autotests/settings/ipv4settingtest.cpp
2017-08-06 18:58:32.000000000 +0200
@@ -41,6 +41,7 @@
QTest::addColumn<QStringList>("dnsSearch");
QTest::addColumn<UIntListList>("addresses");
QTest::addColumn<UIntListList>("routes");
+ QTest::addColumn<int>("routeMetric");
QTest::addColumn<bool>("ignoreAutoRoutes");
QTest::addColumn<bool>("ignoreAutoDns");
QTest::addColumn<QString>("dhcpClientId");
@@ -78,6 +79,7 @@
<< dnsSearch // dnsSearch
<< addresses // addresses
<< routes // routes
+ << 100 // routeMetric
<< true // ignoreAutoRoutes
<< true // ignoreAutoDns
<< QString("home-test") // dhcpClientId
@@ -94,6 +96,7 @@
QFETCH(QStringList, dnsSearch);
QFETCH(UIntListList, addresses);
QFETCH(UIntListList, routes);
+ QFETCH(int, routeMetric);
QFETCH(bool, ignoreAutoRoutes);
QFETCH(bool, ignoreAutoDns);
QFETCH(QString, dhcpClientId);
@@ -109,6 +112,7 @@
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_SEARCH), dnsSearch);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES),
QVariant::fromValue(addresses));
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES),
QVariant::fromValue(routes));
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC),
routeMetric);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES),
ignoreAutoRoutes);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS),
ignoreAutoDns);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID),
dhcpClientId);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.36.0/autotests/settings/ipv6settingtest.cpp
new/networkmanager-qt-5.37.0/autotests/settings/ipv6settingtest.cpp
--- old/networkmanager-qt-5.36.0/autotests/settings/ipv6settingtest.cpp
2017-06-30 23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/autotests/settings/ipv6settingtest.cpp
2017-08-06 18:58:32.000000000 +0200
@@ -46,6 +46,7 @@
QTest::addColumn<QStringList>("dnsSearch");
QTest::addColumn<IpV6DBusAddressList>("addresses");
QTest::addColumn<IpV6DBusRouteList>("routes");
+ QTest::addColumn<int>("routeMetric");
QTest::addColumn<bool>("ignoreAutoRoutes");
QTest::addColumn<bool>("ignoreAutoDns");
QTest::addColumn<bool>("neverDefault");
@@ -81,6 +82,7 @@
<< dnsSearch // dnsSearch
<< addresses // addresses
<< routes // routes
+ << 100 // routeMetric
<< true // ignoreAutoRoutes
<< true // ignoreAutoDns
<< true // neverDefault
@@ -95,6 +97,7 @@
QFETCH(QStringList, dnsSearch);
QFETCH(IpV6DBusAddressList, addresses);
QFETCH(IpV6DBusRouteList, routes);
+ QFETCH(int, routeMetric);
QFETCH(bool, ignoreAutoRoutes);
QFETCH(bool, ignoreAutoDns);
QFETCH(bool, neverDefault);
@@ -108,6 +111,7 @@
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_SEARCH), dnsSearch);
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES),
QVariant::fromValue(addresses));
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES),
QVariant::fromValue(routes));
+ map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC),
routeMetric);
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES),
ignoreAutoRoutes);
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS),
ignoreAutoDns);
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT),
neverDefault);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.36.0/src/settings/ipv4setting.cpp
new/networkmanager-qt-5.37.0/src/settings/ipv4setting.cpp
--- old/networkmanager-qt-5.36.0/src/settings/ipv4setting.cpp 2017-06-30
23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/src/settings/ipv4setting.cpp 2017-08-06
18:58:32.000000000 +0200
@@ -35,6 +35,7 @@
NetworkManager::Ipv4SettingPrivate::Ipv4SettingPrivate()
: name(NMQT_SETTING_IP4_CONFIG_SETTING_NAME)
, method(NetworkManager::Ipv4Setting::Automatic)
+ , routeMetric(-1)
, ignoreAutoRoutes(false)
, ignoreAutoDns(false)
, dhcpSendHostname(true)
@@ -56,6 +57,7 @@
setDnsSearch(other->dnsSearch());
setAddresses(other->addresses());
setRoutes(other->routes());
+ setRouteMetric(other->routeMetric());
setIgnoreAutoRoutes(other->ignoreAutoRoutes());
setIgnoreAutoDns(other->ignoreAutoDns());
setDhcpClientId(other->dhcpClientId());
@@ -147,6 +149,20 @@
return d->routes;
}
+void NetworkManager::Ipv4Setting::setRouteMetric(int metric)
+{
+ Q_D(Ipv4Setting);
+
+ d->routeMetric = metric;
+}
+
+int NetworkManager::Ipv4Setting::routeMetric() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->routeMetric;
+}
+
void NetworkManager::Ipv4Setting::setIgnoreAutoRoutes(bool ignore)
{
Q_D(Ipv4Setting);
@@ -347,6 +363,10 @@
}
}
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC)))
{
+
setRouteMetric(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC)).toInt());
+ }
+
if
(setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES))) {
setIgnoreAutoRoutes(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES)).toBool());
}
@@ -432,6 +452,10 @@
setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES),
QVariant::fromValue(dbusRoutes));
}
+ if(routeMetric() >= 0) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC),
routeMetric());
+ }
+
if (ignoreAutoRoutes()) {
setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES),
ignoreAutoRoutes());
}
@@ -482,6 +506,7 @@
Q_FOREACH (const NetworkManager::IpRoute & route, setting.routes()) {
dbg.nospace() << route.ip() << ": " << route.netmask() << ": " <<
route.nextHop() << ": " << route.metric() << '\n';
}
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC << ":" <<
setting.routeMetric() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES << ": " <<
setting.ignoreAutoRoutes() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS << ": " <<
setting.ignoreAutoDns() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID << ": " <<
setting.dhcpClientId() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.36.0/src/settings/ipv4setting.h
new/networkmanager-qt-5.37.0/src/settings/ipv4setting.h
--- old/networkmanager-qt-5.36.0/src/settings/ipv4setting.h 2017-06-30
23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/src/settings/ipv4setting.h 2017-08-06
18:58:32.000000000 +0200
@@ -108,6 +108,9 @@
void setRoutes(const QList<NetworkManager::IpRoute> &ipv4routes);
QList<NetworkManager::IpRoute> routes() const;
+ void setRouteMetric(int metric);
+ int routeMetric() const;
+
void setIgnoreAutoRoutes(bool ignore);
bool ignoreAutoRoutes() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.36.0/src/settings/ipv4setting_p.h
new/networkmanager-qt-5.37.0/src/settings/ipv4setting_p.h
--- old/networkmanager-qt-5.36.0/src/settings/ipv4setting_p.h 2017-06-30
23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/src/settings/ipv4setting_p.h 2017-08-06
18:58:32.000000000 +0200
@@ -40,6 +40,7 @@
QStringList dnsSearch;
QList<NetworkManager::IpAddress> addresses;
QList<NetworkManager::IpRoute> routes;
+ int routeMetric;
bool ignoreAutoRoutes;
bool ignoreAutoDns;
QString dhcpClientId;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.36.0/src/settings/ipv6setting.cpp
new/networkmanager-qt-5.37.0/src/settings/ipv6setting.cpp
--- old/networkmanager-qt-5.36.0/src/settings/ipv6setting.cpp 2017-06-30
23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/src/settings/ipv6setting.cpp 2017-08-06
18:58:32.000000000 +0200
@@ -35,6 +35,7 @@
NetworkManager::Ipv6SettingPrivate::Ipv6SettingPrivate()
: name(NMQT_SETTING_IP6_CONFIG_SETTING_NAME)
, method(NetworkManager::Ipv6Setting::Automatic)
+ , routeMetric(-1)
, ignoreAutoRoutes(false)
, ignoreAutoDns(false)
, neverDefault(false)
@@ -56,6 +57,7 @@
setDnsSearch(other->dnsSearch());
setAddresses(other->addresses());
setRoutes(other->routes());
+ setRouteMetric(other->routeMetric());
setIgnoreAutoRoutes(other->ignoreAutoRoutes());
setIgnoreAutoDns(other->ignoreAutoDns());
setNeverDefault(other->neverDefault());
@@ -144,6 +146,20 @@
return d->routes;
}
+void NetworkManager::Ipv6Setting::setRouteMetric(int metric)
+{
+ Q_D(Ipv6Setting);
+
+ d->routeMetric = metric;
+}
+
+int NetworkManager::Ipv6Setting::routeMetric() const
+{
+ Q_D(const Ipv6Setting);
+
+ return d->routeMetric;
+}
+
void NetworkManager::Ipv6Setting::setIgnoreAutoRoutes(bool ignore)
{
Q_D(Ipv6Setting);
@@ -313,6 +329,10 @@
setRoutes(routes);
}
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC)))
{
+
setRouteMetric(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC)).toInt());
+ }
+
if
(setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES))) {
setIgnoreAutoRoutes(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES)).toBool());
}
@@ -389,6 +409,10 @@
setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES),
QVariant::fromValue(dbusRoutes));
}
+ if(routeMetric() >= 0) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC),
routeMetric());
+ }
+
if (ignoreAutoRoutes()) {
setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES),
ignoreAutoRoutes());
}
@@ -431,6 +455,7 @@
Q_FOREACH (const NetworkManager::IpRoute & route, setting.routes()) {
dbg.nospace() << route.ip().toString() << ": " << route.metric() << ":
" << route.nextHop().toString() << ": " << route.metric() << '\n';
}
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC << ":" <<
setting.routeMetric() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES << ": " <<
setting.ignoreAutoRoutes() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS << ": " <<
setting.ignoreAutoDns() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT << ": " <<
setting.neverDefault() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.36.0/src/settings/ipv6setting.h
new/networkmanager-qt-5.37.0/src/settings/ipv6setting.h
--- old/networkmanager-qt-5.36.0/src/settings/ipv6setting.h 2017-06-30
23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/src/settings/ipv6setting.h 2017-08-06
18:58:32.000000000 +0200
@@ -113,6 +113,9 @@
void setRoutes(const QList<NetworkManager::IpRoute> ipv6routes);
QList<NetworkManager::IpRoute> routes() const;
+ void setRouteMetric(int metric);
+ int routeMetric() const;
+
void setIgnoreAutoRoutes(bool ignore);
bool ignoreAutoRoutes() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.36.0/src/settings/ipv6setting_p.h
new/networkmanager-qt-5.37.0/src/settings/ipv6setting_p.h
--- old/networkmanager-qt-5.36.0/src/settings/ipv6setting_p.h 2017-06-30
23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/src/settings/ipv6setting_p.h 2017-08-06
18:58:32.000000000 +0200
@@ -40,6 +40,7 @@
QStringList dnsSearch;
QList<NetworkManager::IpAddress> addresses;
QList<NetworkManager::IpRoute> routes;
+ int routeMetric;
bool ignoreAutoRoutes;
bool ignoreAutoDns;
bool neverDefault;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.36.0/src/settings/wirelesssetting.h
new/networkmanager-qt-5.37.0/src/settings/wirelesssetting.h
--- old/networkmanager-qt-5.36.0/src/settings/wirelesssetting.h 2017-06-30
23:57:43.000000000 +0200
+++ new/networkmanager-qt-5.37.0/src/settings/wirelesssetting.h 2017-08-06
18:58:32.000000000 +0200
@@ -54,10 +54,10 @@
};
enum PowerSave {
- PowerSaveDefault = NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
- PowerSaveIgnore = NM_SETTING_WIRELESS_POWERSAVE_IGNORE,
- PowerSaveDisable = NM_SETTING_WIRELESS_POWERSAVE_DISABLE,
- PowerSaveEnable = NM_SETTING_WIRELESS_POWERSAVE_ENABLE
+ PowerSaveDefault = 0,
+ PowerSaveIgnore = 1,
+ PowerSaveDisable = 2,
+ PowerSaveEnable = 3
};
WirelessSetting();
