Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2022-01-11 21:16:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Tue Jan 11 21:16:53 2022 rev:98 rq:945094 version:5.90.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2021-12-13 20:45:07.944490488 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.1892/libKF5NetworkManagerQt.changes
2022-01-11 21:19:51.104983395 +0100
@@ -1,0 +2,11 @@
+Mon Jan 3 12:48:03 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.90.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.90.0
+- Changes since 5.89.0:
+ * Use QStringView in qt6 only
+ * Make it compile against qt6
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.89.0.tar.xz
networkmanager-qt-5.89.0.tar.xz.sig
New:
----
networkmanager-qt-5.90.0.tar.xz
networkmanager-qt-5.90.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.9cf2xz/_old 2022-01-11 21:19:52.016984036 +0100
+++ /var/tmp/diff_new_pack.9cf2xz/_new 2022-01-11 21:19:52.020984039 +0100
@@ -17,22 +17,22 @@
%define soversion 6
-%define _tar_path 5.89
+%define _tar_path 5.90
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
# Only needed for the package signature condition
-%bcond_without lang
+%bcond_without released
Name: libKF5NetworkManagerQt
-Version: 5.89.0
+Version: 5.90.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
Group: System/GUI/KDE
URL: https://www.kde.org
Source: networkmanager-qt-%{version}.tar.xz
-%if %{with lang}
+%if %{with released}
Source1: networkmanager-qt-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
++++++ networkmanager-qt-5.89.0.tar.xz -> networkmanager-qt-5.90.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.89.0/CMakeLists.txt
new/networkmanager-qt-5.90.0/CMakeLists.txt
--- old/networkmanager-qt-5.89.0/CMakeLists.txt 2021-12-04 18:06:03.000000000
+0100
+++ new/networkmanager-qt-5.90.0/CMakeLists.txt 2022-01-01 13:20:50.000000000
+0100
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "5.89.0") # handled by release scripts
+set(KF_VERSION "5.90.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 5.89.0 NO_MODULE)
+find_package(ECM 5.90.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)
@@ -21,7 +21,7 @@
include(KDEGitCommitHooks)
set(REQUIRED_QT_VERSION 5.15.2)
-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Network)
+find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED Core DBus
Network)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
@@ -88,7 +88,7 @@
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/networkmanagerqt_version.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel
)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.89.0/KF5NetworkManagerQtConfig.cmake.in
new/networkmanager-qt-5.90.0/KF5NetworkManagerQtConfig.cmake.in
--- old/networkmanager-qt-5.89.0/KF5NetworkManagerQtConfig.cmake.in
2021-12-04 18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/KF5NetworkManagerQtConfig.cmake.in
2022-01-01 13:20:50.000000000 +0100
@@ -1,7 +1,7 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
-find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
+find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@)
find_package(PkgConfig)
pkg_search_module(NetworkManager REQUIRED IMPORTED_TARGET libnm>=1.4.0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.89.0/autotests/CMakeLists.txt
new/networkmanager-qt-5.90.0/autotests/CMakeLists.txt
--- old/networkmanager-qt-5.89.0/autotests/CMakeLists.txt 2021-12-04
18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/autotests/CMakeLists.txt 2022-01-01
13:20:50.000000000 +0100
@@ -4,11 +4,11 @@
include(ECMAddTests)
-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test)
-set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for autotests")
+find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED
Test)
+set_package_properties(Qt${QT_MAJOR_VERSION}Test PROPERTIES PURPOSE "Required
for autotests")
-ecm_add_test(managertest.cpp LINK_LIBRARIES Qt5::Test
KF5NetworkManagerQt_static PkgConfig::NetworkManager fakeNetwork)
-ecm_add_test(settingstest.cpp LINK_LIBRARIES Qt5::Test
KF5NetworkManagerQt_static PkgConfig::NetworkManager fakeNetwork)
-ecm_add_test(activeconnectiontest.cpp LINK_LIBRARIES Qt5::Test
KF5NetworkManagerQt_static PkgConfig::NetworkManager fakeNetwork)
+ecm_add_test(managertest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test
KF5NetworkManagerQt_static PkgConfig::NetworkManager fakeNetwork)
+ecm_add_test(settingstest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test
KF5NetworkManagerQt_static PkgConfig::NetworkManager fakeNetwork)
+ecm_add_test(activeconnectiontest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5NetworkManagerQt_static
PkgConfig::NetworkManager fakeNetwork)
add_subdirectory(settings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.89.0/autotests/settings/CMakeLists.txt
new/networkmanager-qt-5.90.0/autotests/settings/CMakeLists.txt
--- old/networkmanager-qt-5.89.0/autotests/settings/CMakeLists.txt
2021-12-04 18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/autotests/settings/CMakeLists.txt
2022-01-01 13:20:50.000000000 +0100
@@ -1,6 +1,6 @@
macro(NETWORKMANAGERQT_AUTOTESTS)
foreach(_testname ${ARGN})
- ecm_add_test(${_testname}.cpp LINK_LIBRARIES Qt5::Test
KF5NetworkManagerQt_static)
+ ecm_add_test(${_testname}.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5NetworkManagerQt_static)
endforeach(_testname)
endmacro(NETWORKMANAGERQT_AUTOTESTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.89.0/examples/CMakeLists.txt
new/networkmanager-qt-5.90.0/examples/CMakeLists.txt
--- old/networkmanager-qt-5.89.0/examples/CMakeLists.txt 2021-12-04
18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/examples/CMakeLists.txt 2022-01-01
13:20:50.000000000 +0100
@@ -5,7 +5,7 @@
add_executable(exampleNetworkManagerQt ${exampleNetworkManagerQt_SRCS})
target_link_libraries(exampleNetworkManagerQt
KF5::NetworkManagerQt
- Qt5::Core
- Qt5::Network)
+ Qt${QT_MAJOR_VERSION}::Core
+ Qt${QT_MAJOR_VERSION}::Network)
add_subdirectory(createconnection)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.89.0/examples/createconnection/CMakeLists.txt
new/networkmanager-qt-5.90.0/examples/createconnection/CMakeLists.txt
--- old/networkmanager-qt-5.89.0/examples/createconnection/CMakeLists.txt
2021-12-04 18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/examples/createconnection/CMakeLists.txt
2022-01-01 13:20:50.000000000 +0100
@@ -6,5 +6,5 @@
add_executable(createConnectionExample ${createConnectionExample_SRCS})
target_link_libraries(createConnectionExample
KF5::NetworkManagerQt
- Qt5::Core
- Qt5::Network)
+ Qt${QT_MAJOR_VERSION}::Core
+ Qt${QT_MAJOR_VERSION}::Network)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.89.0/src/CMakeLists.txt
new/networkmanager-qt-5.90.0/src/CMakeLists.txt
--- old/networkmanager-qt-5.89.0/src/CMakeLists.txt 2021-12-04
18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/src/CMakeLists.txt 2022-01-01
13:20:50.000000000 +0100
@@ -150,11 +150,11 @@
generate_export_header(KF5NetworkManagerQt EXPORT_FILE_NAME
${NetworkManagerQt_BINARY_DIR}/networkmanagerqt/networkmanagerqt_export.h
BASE_NAME NetworkManagerQt)
add_library(KF5::NetworkManagerQt ALIAS KF5NetworkManagerQt)
-target_include_directories(KF5NetworkManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/NetworkManagerQt>")
+target_include_directories(KF5NetworkManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/NetworkManagerQt>")
# for examples to build
target_include_directories(KF5NetworkManagerQt PUBLIC
"$<BUILD_INTERFACE:${NetworkManagerQt_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/settings;${CMAKE_CURRENT_BINARY_DIR}>")
-target_link_libraries(KF5NetworkManagerQt PUBLIC Qt5::Core Qt5::Network
Qt5::DBus PkgConfig::NetworkManager PkgConfig::Gio)
+target_link_libraries(KF5NetworkManagerQt PUBLIC Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::DBus
PkgConfig::NetworkManager PkgConfig::Gio)
set_target_properties(KF5NetworkManagerQt PROPERTIES VERSION
${NETWORKMANAGERQT_VERSION}
SOVERSION
${NETWORKMANAGERQT_SOVERSION}
@@ -165,7 +165,7 @@
add_library(KF5NetworkManagerQt_static STATIC ${NetworkManagerQt_PART_SRCS}
${NetworkManagerQt_SETTINGS_SRCS} ${DBUS_INTERFACE_SRCS})
set_target_properties(KF5NetworkManagerQt_static PROPERTIES COMPILE_FLAGS
-DNMQT_STATIC=1)
-target_link_libraries(KF5NetworkManagerQt_static PUBLIC Qt5::Core Qt5::Network
Qt5::DBus PkgConfig::NetworkManager PkgConfig::Gio)
+target_link_libraries(KF5NetworkManagerQt_static PUBLIC
Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Network
Qt${QT_MAJOR_VERSION}::DBus PkgConfig::NetworkManager PkgConfig::Gio)
target_include_directories(KF5NetworkManagerQt_static PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>")
ecm_generate_headers(NetworkManagerQt_CamelCase_HEADERS
@@ -256,14 +256,14 @@
install(FILES
${NetworkManagerQt_CamelCase_HEADERS}
${NetworkManagerQt_SETTINGS_CamelCase_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/NetworkManagerQt/NetworkManagerQt
COMPONENT Devel
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/NetworkManagerQt/NetworkManagerQt
COMPONENT Devel
)
install(FILES
${NetworkManagerQt_BINARY_DIR}/networkmanagerqt/networkmanagerqt_export.h
${NetworkManagerQt_HEADERS}
${NetworkManagerQt_SETTINGS_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/NetworkManagerQt/networkmanagerqt
COMPONENT Devel
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/NetworkManagerQt/networkmanagerqt
COMPONENT Devel
)
ecm_qt_install_logging_categories(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.89.0/src/dbus/secretagentadaptor.h
new/networkmanager-qt-5.90.0/src/dbus/secretagentadaptor.h
--- old/networkmanager-qt-5.89.0/src/dbus/secretagentadaptor.h 2021-12-04
18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/src/dbus/secretagentadaptor.h 2022-01-01
13:20:50.000000000 +0100
@@ -14,6 +14,7 @@
#include "secretagent.h"
#include <QObject>
+#include <QStringList>
#include <QtDBus>
QT_BEGIN_NAMESPACE
class QByteArray;
@@ -22,7 +23,6 @@
template<class Key, class Value>
class QMap;
class QString;
-class QStringList;
class QVariant;
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.89.0/src/fakenetwork/CMakeLists.txt
new/networkmanager-qt-5.90.0/src/fakenetwork/CMakeLists.txt
--- old/networkmanager-qt-5.89.0/src/fakenetwork/CMakeLists.txt 2021-12-04
18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/src/fakenetwork/CMakeLists.txt 2022-01-01
13:20:50.000000000 +0100
@@ -17,7 +17,7 @@
target_link_libraries(fakeNetwork
KF5NetworkManagerQt_static
- Qt5::Core
- Qt5::Network
- Qt5::DBus
+ Qt${QT_MAJOR_VERSION}::Core
+ Qt${QT_MAJOR_VERSION}::Network
+ Qt${QT_MAJOR_VERSION}::DBus
PkgConfig::NetworkManager)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.89.0/src/manager.cpp
new/networkmanager-qt-5.90.0/src/manager.cpp
--- old/networkmanager-qt-5.89.0/src/manager.cpp 2021-12-04
18:06:03.000000000 +0100
+++ new/networkmanager-qt-5.90.0/src/manager.cpp 2022-01-01
13:20:50.000000000 +0100
@@ -194,9 +194,11 @@
int x;
int y;
int z;
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ const auto sl = QStringView(version).split('.');
+#else
const auto sl = version.splitRef('.');
-
+#endif
if (sl.size() > 2) {
x = sl[0].toInt();
y = sl[1].toInt();
