Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libKF5ModemManagerQt for
openSUSE:Factory checked in at 2022-01-11 21:16:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5ModemManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5ModemManagerQt"
Tue Jan 11 21:16:52 2022 rev:94 rq:945093 version:5.90.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5ModemManagerQt/libKF5ModemManagerQt.changes
2021-12-13 20:45:05.908490239 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new.1892/libKF5ModemManagerQt.changes
2022-01-11 21:19:49.440982224 +0100
@@ -1,0 +2,11 @@
+Mon Jan 3 12:48:02 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::sliced
+ * Make it compile against qt6
+
+-------------------------------------------------------------------
Old:
----
modemmanager-qt-5.89.0.tar.xz
modemmanager-qt-5.89.0.tar.xz.sig
New:
----
modemmanager-qt-5.90.0.tar.xz
modemmanager-qt-5.90.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5ModemManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.KoRIFQ/_old 2022-01-11 21:19:50.148982723 +0100
+++ /var/tmp/diff_new_pack.KoRIFQ/_new 2022-01-11 21:19:50.152982725 +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: libKF5ModemManagerQt
-Version: 5.89.0
+Version: 5.90.0
Release: 0
Summary: Qt wrapper for ModemManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
Group: System/GUI/KDE
URL: https://www.kde.org
Source: modemmanager-qt-%{version}.tar.xz
-%if %{with lang}
+%if %{with released}
Source1: modemmanager-qt-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
++++++ modemmanager-qt-5.89.0.tar.xz -> modemmanager-qt-5.90.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.89.0/CMakeLists.txt
new/modemmanager-qt-5.90.0/CMakeLists.txt
--- old/modemmanager-qt-5.89.0/CMakeLists.txt 2021-12-04 18:05:54.000000000
+0100
+++ new/modemmanager-qt-5.90.0/CMakeLists.txt 2022-01-01 13:20:40.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(ModemManagerQt 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)
@@ -19,7 +19,7 @@
include(KDEGitCommitHooks)
set(REQUIRED_QT_VERSION 5.15.2)
-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Xml)
+find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED Core DBus
Xml)
add_definitions(${QT_DEFINITIONS})
@@ -86,7 +86,7 @@
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/modemmanagerqt_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/modemmanager-qt-5.89.0/KF5ModemManagerQtConfig.cmake.in
new/modemmanager-qt-5.90.0/KF5ModemManagerQtConfig.cmake.in
--- old/modemmanager-qt-5.89.0/KF5ModemManagerQtConfig.cmake.in 2021-12-04
18:05:54.000000000 +0100
+++ new/modemmanager-qt-5.90.0/KF5ModemManagerQtConfig.cmake.in 2022-01-01
13:20:40.000000000 +0100
@@ -1,8 +1,8 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
-find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
-find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
+find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@)
+find_dependency(Qt@QT_MAJOR_VERSION@DBus @REQUIRED_QT_VERSION@)
include("${CMAKE_CURRENT_LIST_DIR}/KF5ModemManagerQtTargets.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.89.0/autotests/CMakeLists.txt
new/modemmanager-qt-5.90.0/autotests/CMakeLists.txt
--- old/modemmanager-qt-5.89.0/autotests/CMakeLists.txt 2021-12-04
18:05:54.000000000 +0100
+++ new/modemmanager-qt-5.90.0/autotests/CMakeLists.txt 2022-01-01
13:20:40.000000000 +0100
@@ -4,33 +4,33 @@
include(ECMAddTests)
-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test)
+find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED
Test)
set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for autotests")
macro(serialize_test target)
set_property(TEST ${target} PROPERTY RUN_SERIAL 1)
endmacro()
-ecm_add_test(bearerpropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(bearerpropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(bearerpropertiestest)
-ecm_add_test(modemtest.cpp LINK_LIBRARIES Qt5::Test KF5ModemManagerQt_static
fakeModem)
+ecm_add_test(modemtest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test
KF5ModemManagerQt_static fakeModem)
serialize_test(modemtest)
-ecm_add_test(modempropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(modempropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modempropertiestest)
-ecm_add_test(modem3gpppropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(modem3gpppropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modem3gpppropertiestest)
-ecm_add_test(modem3gppussdpropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(modem3gppussdpropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modem3gppussdpropertiestest)
-ecm_add_test(modemcdmapropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(modemcdmapropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modemcdmapropertiestest)
-ecm_add_test(modemmessagingpropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(modemmessagingpropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modemmessagingpropertiestest)
-ecm_add_test(modemlocationpropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(modemlocationpropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modemlocationpropertiestest)
-ecm_add_test(modemtimepropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ecm_add_test(modemtimepropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modemtimepropertiestest)
if (${MODEMMANAGER_VERSION} VERSION_EQUAL 1.2.0 OR ${MODEMMANAGER_VERSION}
VERSION_GREATER 1.2.0)
- ecm_add_test(modemomapropertiestest.cpp LINK_LIBRARIES Qt5::Test
KF5ModemManagerQt_static fakeModem)
+ ecm_add_test(modemomapropertiestest.cpp LINK_LIBRARIES
Qt${QT_MAJOR_VERSION}::Test KF5ModemManagerQt_static fakeModem)
serialize_test(modemomapropertiestest)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.89.0/examples/CMakeLists.txt
new/modemmanager-qt-5.90.0/examples/CMakeLists.txt
--- old/modemmanager-qt-5.89.0/examples/CMakeLists.txt 2021-12-04
18:05:54.000000000 +0100
+++ new/modemmanager-qt-5.90.0/examples/CMakeLists.txt 2022-01-01
13:20:40.000000000 +0100
@@ -3,7 +3,7 @@
find_package(KF5ModemManagerQt ${KF_VERSION} REQUIRED)
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Core
DBus
Xml
@@ -18,5 +18,5 @@
add_executable(exampleModemManagerQt ${exampleModemManagerQt_SRCS})
target_link_libraries(exampleModemManagerQt
KF5::ModemManagerQt
- Qt5::Core
+ Qt${QT_MAJOR_VERSION}::Core
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.89.0/src/CMakeLists.txt
new/modemmanager-qt-5.90.0/src/CMakeLists.txt
--- old/modemmanager-qt-5.89.0/src/CMakeLists.txt 2021-12-04
18:05:54.000000000 +0100
+++ new/modemmanager-qt-5.90.0/src/CMakeLists.txt 2022-01-01
13:20:40.000000000 +0100
@@ -81,9 +81,9 @@
generate_export_header(KF5ModemManagerQt BASE_NAME ModemManagerQt)
add_library(KF5::ModemManagerQt ALIAS KF5ModemManagerQt)
-target_include_directories(KF5ModemManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/ModemManagerQt>")
+target_include_directories(KF5ModemManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/ModemManagerQt>")
-target_link_libraries(KF5ModemManagerQt PUBLIC Qt5::Core Qt5::DBus PRIVATE
Qt5::Xml)
+target_link_libraries(KF5ModemManagerQt PUBLIC Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::DBus PRIVATE Qt${QT_MAJOR_VERSION}::Xml)
set_target_properties(KF5ModemManagerQt PROPERTIES VERSION
${MODEMMANAGERQT_VERSION}
SOVERSION
${MODEMMANAGERQT_SOVERSION}
@@ -96,7 +96,7 @@
add_library(KF5ModemManagerQt_static STATIC ${ModemManagerQt_SRCS}
${DBUS_INTERFACES_FILES})
set_target_properties(KF5ModemManagerQt_static PROPERTIES COMPILE_FLAGS
-DMMQT_STATIC=1)
-target_link_libraries(KF5ModemManagerQt_static PUBLIC Qt5::Core Qt5::DBus
Qt5::Xml)
+target_link_libraries(KF5ModemManagerQt_static PUBLIC
Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::DBus
Qt${QT_MAJOR_VERSION}::Xml)
target_include_directories(KF5ModemManagerQt_static PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>")
ecm_generate_headers(ModemManagerQt_HEADERS
@@ -128,16 +128,16 @@
install(TARGETS KF5ModemManagerQt EXPORT KF5ModemManagerQtTargets
${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
# KF6: install to path having both include visibility layer & namespace dir
prefix
-# CamelCase includes to
${KDE_INSTALL_INCLUDEDIR_KF5}/ModemManagerQt/ModemManagerQt
-# normal headers to ${KDE_INSTALL_INCLUDEDIR_KF5}/ModemManagerQt/modemmanagerqt
+# CamelCase includes to
${KDE_INSTALL_INCLUDEDIR_KF}/ModemManagerQt/ModemManagerQt
+# normal headers to ${KDE_INSTALL_INCLUDEDIR_KF}/ModemManagerQt/modemmanagerqt
# The generated cmake config files are already accidentally pointing to the
first layer, by
-# target_include_directories(KF5ModemManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/ModemManagerQt>")
-# next to the actual include base ${KDE_INSTALL_INCLUDEDIR_KF5} being set via
KF5_INSTALL_TARGETS_DEFAULT_ARGS
+# target_include_directories(KF5ModemManagerQt INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/ModemManagerQt>")
+# next to the actual include base ${KDE_INSTALL_INCLUDEDIR_KF} being set via
KF5_INSTALL_TARGETS_DEFAULT_ARGS
# so this can stay untouched
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/modemmanagerqt_export.h
${ModemManagerQt_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/ModemManagerQt COMPONENT Devel
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/ModemManagerQt COMPONENT Devel
)
ecm_qt_install_logging_categories(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.89.0/src/fakemodem/CMakeLists.txt
new/modemmanager-qt-5.90.0/src/fakemodem/CMakeLists.txt
--- old/modemmanager-qt-5.89.0/src/fakemodem/CMakeLists.txt 2021-12-04
18:05:54.000000000 +0100
+++ new/modemmanager-qt-5.90.0/src/fakemodem/CMakeLists.txt 2022-01-01
13:20:40.000000000 +0100
@@ -26,5 +26,5 @@
target_link_libraries(fakeModem
KF5ModemManagerQt_static
- Qt5::Core
- Qt5::DBus)
+ Qt${QT_MAJOR_VERSION}::Core
+ Qt${QT_MAJOR_VERSION}::DBus)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.89.0/src/modem3gpp.cpp
new/modemmanager-qt-5.90.0/src/modem3gpp.cpp
--- old/modemmanager-qt-5.89.0/src/modem3gpp.cpp 2021-12-04
18:05:54.000000000 +0100
+++ new/modemmanager-qt-5.90.0/src/modem3gpp.cpp 2022-01-01
13:20:40.000000000 +0100
@@ -157,8 +157,14 @@
if (it != properties.constEnd()) {
operatorCode = it->toString();
Q_EMIT q->operatorCodeChanged(operatorCode);
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ QStringView mcc(operatorCode);
+ if (!operatorCode.isEmpty() && operatorCode.count() > 3) {
+ mcc = mcc.sliced(0, 3);
+ }
+#else
QStringRef mcc(&operatorCode, 0, 3);
+#endif
QString cc = mobileCountryCodeToAlpha2CountryCode(mcc.toInt());
if (cc != countryCode) {
countryCode = cc;
