Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Leap:15.2 checked in at 2020-03-21 16:44:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Leap:15.2/.libKF5NetworkManagerQt.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Sat Mar 21 16:44:56 2020 rev:62 rq:786839 version:5.68.0
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2020-02-16 18:28:27.378722268 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.libKF5NetworkManagerQt.new.3160/libKF5NetworkManagerQt.changes
2020-03-21 16:46:13.637590101 +0100
@@ -1,0 +2,13 @@
+Sun Mar 8 09:18:04 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.68.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.68.0.php
+- Changes since 5.67.0:
+ * Make it compile against qt5.15. SkipEmptyParts is part of Qt::.
+ * Support SAE in securityTypeFromConnectionSetting
+ * Drop qmake pri file generation & installation, currently broken
+ * Use ecm_qt_install_logging_categories over manual categories file
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.67.0.tar.xz
networkmanager-qt-5.67.0.tar.xz.sig
New:
----
networkmanager-qt-5.68.0.tar.xz
networkmanager-qt-5.68.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.qzppFg/_old 2020-03-21 16:46:14.197590675 +0100
+++ /var/tmp/diff_new_pack.qzppFg/_new 2020-03-21 16:46:14.201590678 +0100
@@ -17,7 +17,7 @@
%define soversion 6
-%define _tar_path 5.67
+%define _tar_path 5.68
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: libKF5NetworkManagerQt
-Version: 5.67.0
+Version: 5.68.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
@@ -93,13 +93,12 @@
%files -n libKF5NetworkManagerQt%{soversion}
%license COPYING*
%{_kf5_libdir}/libKF5NetworkManagerQt.so.*
-%{_kf5_debugdir}/networkmanager-qt.categories
+%{_kf5_debugdir}/networkmanagerqt.categories
%files devel
%license COPYING*
%{_kf5_libdir}/libKF5NetworkManagerQt.so
%{_kf5_includedir}/
%{_kf5_libdir}/cmake/KF5NetworkManagerQt/
-%{_kf5_mkspecsdir}/qt_NetworkManagerQt.pri
%changelog
++++++ networkmanager-qt-5.67.0.tar.xz -> networkmanager-qt-5.68.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.67.0/.gitignore
new/networkmanager-qt-5.68.0/.gitignore
--- old/networkmanager-qt-5.67.0/.gitignore 2020-02-01 10:08:21.000000000
+0100
+++ new/networkmanager-qt-5.68.0/.gitignore 2020-03-07 09:55:15.000000000
+0100
@@ -19,3 +19,4 @@
/build*/
CMakeLists.txt.user*
*.unc-backup*
+.cmake/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.67.0/CMakeLists.txt
new/networkmanager-qt-5.68.0/CMakeLists.txt
--- old/networkmanager-qt-5.67.0/CMakeLists.txt 2020-02-01 10:08:21.000000000
+0100
+++ new/networkmanager-qt-5.68.0/CMakeLists.txt 2020-03-07 09:55:15.000000000
+0100
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.67.0") # handled by release scripts
+set(KF5_VERSION "5.68.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.67.0 NO_MODULE)
+find_package(ECM 5.68.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -31,6 +31,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
include(ECMAddQch)
+include(ECMQtDeclareLoggingCategory)
option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt
Assistant, Qt Creator & KDevelop)" OFF)
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g.
Qt Assistant, Qt Creator & KDevelop)")
@@ -88,5 +89,4 @@
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
)
-install(FILES networkmanager-qt.categories DESTINATION
${KDE_INSTALL_LOGGINGCATEGORIESDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.67.0/metainfo.yaml
new/networkmanager-qt-5.68.0/metainfo.yaml
--- old/networkmanager-qt-5.67.0/metainfo.yaml 2020-02-01 10:08:21.000000000
+0100
+++ new/networkmanager-qt-5.68.0/metainfo.yaml 2020-03-07 09:55:15.000000000
+0100
@@ -12,8 +12,7 @@
deprecated: false
release: true
libraries:
- - qmake: NetworkManagerQt
- cmake: "KF5NetworkManagerQt"
+ - cmake: "KF5NetworkManagerQt"
cmakename: KF5NetworkManagerQt
public_lib: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.67.0/networkmanager-qt.categories
new/networkmanager-qt-5.68.0/networkmanager-qt.categories
--- old/networkmanager-qt-5.67.0/networkmanager-qt.categories 2020-02-01
10:08:21.000000000 +0100
+++ new/networkmanager-qt-5.68.0/networkmanager-qt.categories 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-networkmanager-qt NetworkManagerQt DEFAULT_SEVERITY [WARNING] IDENTIFIER
[NMQT]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.67.0/src/CMakeLists.txt
new/networkmanager-qt-5.68.0/src/CMakeLists.txt
--- old/networkmanager-qt-5.67.0/src/CMakeLists.txt 2020-02-01
10:08:21.000000000 +0100
+++ new/networkmanager-qt-5.68.0/src/CMakeLists.txt 2020-03-07
09:55:15.000000000 +0100
@@ -138,6 +138,14 @@
dbus/wireguarddeviceinterface.cpp
)
+ecm_qt_export_logging_category(
+ IDENTIFIER NMQT
+ CATEGORY_NAME networkmanager-qt
+ DEFAULT_SEVERITY Warning
+ DESCRIPTION "NetworkManagerQt"
+ EXPORT NETWORMANAGERQT
+)
+
add_library(KF5NetworkManagerQt SHARED ${NetworkManagerQt_PART_SRCS}
${NetworkManagerQt_SETTINGS_SRCS} ${DBUS_INTERFACE_SRCS})
generate_export_header(KF5NetworkManagerQt EXPORT_FILE_NAME
${NetworkManagerQt_BINARY_DIR}/networkmanagerqt/networkmanagerqt_export.h
BASE_NAME NetworkManagerQt)
add_library(KF5::NetworkManagerQt ALIAS KF5NetworkManagerQt)
@@ -264,6 +272,12 @@
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/NetworkManagerQt/networkmanagerqt
COMPONENT Devel
)
+ecm_qt_install_logging_categories(
+ EXPORT NETWORMANAGERQT
+ FILE networkmanagerqt.categories
+ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+)
+
if(BUILD_QCH)
ecm_add_qch(
KF5NetworkManagerQt_QCH
@@ -288,7 +302,3 @@
COMPONENT Devel
)
endif()
-
-include(ECMGeneratePriFile)
-ecm_generate_pri_file(BASE_NAME NetworkManagerQt LIB_NAME KF5NetworkManagerQt
DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${KDE_INSTALL_INCLUDEDIR_KF5}/NetworkManagerQt)
-install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.67.0/src/settings/connectionsettings.cpp
new/networkmanager-qt-5.68.0/src/settings/connectionsettings.cpp
--- old/networkmanager-qt-5.67.0/src/settings/connectionsettings.cpp
2020-02-01 10:08:21.000000000 +0100
+++ new/networkmanager-qt-5.68.0/src/settings/connectionsettings.cpp
2020-03-07 09:55:15.000000000 +0100
@@ -525,7 +525,11 @@
if
(connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_PERMISSIONS)))
{
QStringList permissions =
connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_PERMISSIONS)).toStringList();
Q_FOREACH (const QString & permission, permissions) {
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList split = permission.split(QLatin1Char(':'),
QString::KeepEmptyParts);
+#else
+ const QStringList split = permission.split(QLatin1Char(':'),
Qt::KeepEmptyParts);
+#endif
addToPermissions(split.at(1), split.at(2));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.67.0/src/utils.cpp
new/networkmanager-qt-5.68.0/src/utils.cpp
--- old/networkmanager-qt-5.67.0/src/utils.cpp 2020-02-01 10:08:21.000000000
+0100
+++ new/networkmanager-qt-5.68.0/src/utils.cpp 2020-03-07 09:55:15.000000000
+0100
@@ -480,6 +480,8 @@
return WpaEap;
}
return Wpa2Eap;
+ } else if (wifiSecuritySetting->keyMgmt() == WirelessSecuritySetting::SAE)
{
+ return SAE;
}
return NoneSecurity;
