Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpkpass for openSUSE:Factory checked in at 2023-04-23 22:45:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpkpass (Old) and /work/SRC/openSUSE:Factory/.kpkpass.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpkpass" Sun Apr 23 22:45:09 2023 rev:57 rq:1081997 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpkpass/kpkpass.changes 2023-03-03 22:26:40.958985730 +0100 +++ /work/SRC/openSUSE:Factory/.kpkpass.new.1533/kpkpass.changes 2023-04-23 22:46:57.662541092 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:46:11 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.04.0/ + +------------------------------------------------------------------- +Fri Mar 31 16:42:20 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:43:58 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- kpkpass-22.12.3.tar.xz kpkpass-22.12.3.tar.xz.sig New: ---- kpkpass-23.04.0.tar.xz kpkpass-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpkpass.spec ++++++ --- /var/tmp/diff_new_pack.uIpaPm/_old 2023-04-23 22:46:58.706546991 +0200 +++ /var/tmp/diff_new_pack.uIpaPm/_new 2023-04-23 22:46:58.710547014 +0200 @@ -17,8 +17,9 @@ %bcond_without released +%define libname libKPim5PkPass5 Name: kpkpass -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: Library to parse Passbook files License: LGPL-2.1-or-later @@ -34,25 +35,24 @@ BuildRequires: cmake(KF5Archive) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Test) +Conflicts: libKPimPkPass5 < %{version} %description kpkpass is a library to read and parse Apple Passbook files, such as the ones commonly used for hotel and flight reservations. -%package -n libKPimPkPass5 +%package -n %{libname} Summary: Library to parse Passbook files -%if %{pkg_vcmp shared-mime-info < 2.2} -Requires: %{name} -%endif +%requires_eq %{name} -%description -n libKPimPkPass5 +%description -n %{libname} kpkpass is a library to read and parse Apple Passbook files, such as the ones commonly used for hotel and flight reservations. This package contains the library itself. %package devel Summary: Development files for kpkpass -Requires: libKPimPkPass5 = %{version} +Requires: %{libname} = %{version} Requires: cmake(KF5Archive) %description devel @@ -63,28 +63,29 @@ %autosetup -p1 %build - %cmake_kf5 -d build - %cmake_build +%cmake_kf5 -d build +%cmake_build %install - %kf5_makeinstall -C build +%kf5_makeinstall -C build -%ldconfig_scriptlets -n libKPimPkPass5 +%ldconfig_scriptlets -n %{libname} -%if %{pkg_vcmp shared-mime-info < 2.2} %files +%license LICENSES/* +%if %{pkg_vcmp shared-mime-info < 2.2} %{_datadir}/mime/packages/application-vnd-apple-pkpass.xml %endif - -%files -n libKPimPkPass5 -%license LICENSES/* -%{_kf5_libdir}/libKPimPkPass.so.* %{_kf5_debugdir}/*.categories +%files -n %{libname} +%{_kf5_libdir}/libKPim5PkPass.so.* + %files devel -%dir %{_includedir}/KPim/ -%{_includedir}/KPim/KPkPass/ +%dir %{_includedir}/KPim5/ +%{_includedir}/KPim5/KPkPass/ %{_kf5_cmakedir}/KPimPkPass/ -%{_kf5_libdir}/libKPimPkPass.so +%{_kf5_cmakedir}/KPim5PkPass/ +%{_kf5_libdir}/libKPim5PkPass.so %changelog ++++++ kpkpass-22.12.3.tar.xz -> kpkpass-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/.codespellrc.license new/kpkpass-23.04.0/.codespellrc.license --- old/kpkpass-22.12.3/.codespellrc.license 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/.codespellrc.license 2023-04-02 17:36:59.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2022-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/.gitlab-ci.yml new/kpkpass-23.04.0/.gitlab-ci.yml --- old/kpkpass-22.12.3/.gitlab-ci.yml 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/.gitlab-ci.yml 2023-04-02 17:36:59.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2020-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/.kde-ci.yml new/kpkpass-23.04.0/.kde-ci.yml --- old/kpkpass-22.12.3/.kde-ci.yml 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/.kde-ci.yml 2023-04-02 17:36:59.000000000 +0200 @@ -2,10 +2,15 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'Android/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'frameworks/karchive' : '@latest' +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'Android/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/karchive' : '@latest-kf6' + Options: require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/CMakeLists.txt new/kpkpass-23.04.0/CMakeLists.txt --- old/kpkpass-22.12.3/CMakeLists.txt 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/CMakeLists.txt 2023-04-02 17:36:59.000000000 +0200 @@ -1,14 +1,14 @@ # SPDX-FileCopyrightText: 2018-2020 Volker Krause <[email protected]> -# SPDX-FileCopyrightText: 2018-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2018-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.22.3") +set(PIM_VERSION "5.23.0") project(KPkPass VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.99.0") +set(KF_MIN_VERSION "5.103.0") -find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) +find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDECompilerSettings NO_POLICY_SCOPE) @@ -31,20 +31,28 @@ 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)") + +set(QT_REQUIRED_VERSION "5.15.2") +if (QT_MAJOR_VERSION STREQUAL "6") + set(QT_MIN_VERSION "6.4.0") + set(KF_MIN_VERSION "5.240.0") + set(KF_MAJOR_VERSION "6") +else() + set(KF_MAJOR_VERSION "5") +endif() + ecm_setup_version(PROJECT VARIABLE_PREFIX KPKPASS VERSION_HEADER kpkpass_version.h - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimPkPassConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}PkPassConfigVersion.cmake" ) -set(QT_REQUIRED_VERSION "5.15.2") - find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive) +find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Archive) if (NOT ANDROID) find_package(SharedMimeInfo 1.3 REQUIRED) endif() -ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.99.0) +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) @@ -64,32 +72,69 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimPkPass") - +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}PkPass") +set(KPKPASS_KF5_COMPAT FALSE) configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimPkPassConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KPimPkPassConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}PkPassConfig.cmake" INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}" ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPimPkPassConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KPimPkPassConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}PkPassConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}PkPassConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel) -install(EXPORT KPimPkPassTargets +install(EXPORT KPim${KF_MAJOR_VERSION}PkPassTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KPimPkPassTargets.cmake - NAMESPACE KPim:: + FILE KPim${KF_MAJOR_VERSION}PkPassTargets.cmake + NAMESPACE KPim${KF_MAJOR_VERSION}:: ) if (BUILD_QCH) ecm_install_qch_export( - TARGETS KPimPkPass_QCH - FILE KPimPkPassQchTargets.cmake + TARGETS KPim${KF_MAJOR_VERSION}PkPass_QCH + FILE KPim${KF_MAJOR_VERSION}PkPassQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPimPkPassQchTargets.cmake\")") + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}PkPassQchTargets.cmake\")") +endif() + +#if (QT_MAJOR_VERSION STREQUAL "5") +## +# TODO: Backwards compatiblity. Remove in next major version +## +set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimPkPass") +set(KPKPASS_KF5_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimPkPassConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPimPkPassConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPimPkPassConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}PkPassConfigVersion.cmake" + RENAME "KPimPkPassConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}PkPassTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + FILE KPim${KF_MAJOR_VERSION}PkPassTargets.cmake + NAMESPACE KPim:: +) +if (BUILD_QCH) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}PkPassQchTargets.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel + ) endif() +#endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/CMakePresets.json new/kpkpass-23.04.0/CMakePresets.json --- old/kpkpass-22.12.3/CMakePresets.json 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/CMakePresets.json 2023-04-02 17:36:59.000000000 +0200 @@ -5,28 +5,35 @@ "name": "base", "displayName": "base preset", "generator": "Ninja", - "binaryDir": "${sourceDir}/build-${presetName}", - "installDir": "$env{KF5}", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF5}", "hidden": true }, { - "name": "dev", - "displayName": "Build as debug", + "name": "base-qt6", + "displayName": "base preset", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF6}", + "hidden": true + }, + { + "name": "dev-mold", + "displayName": "Build as debug + using mold linker", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold" }, "inherits": [ "base" ] - }, { - "name": "coverage", + "name": "dev", "displayName": "Build as debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "BUILD_COVERAGE": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, "inherits": [ @@ -43,19 +50,7 @@ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, "inherits": [ - "base" - ] - }, - { - "name": "dev-disable-deprecated", - "displayName": "Build as without deprecated methods", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" - }, - "inherits": [ - "base" + "base-qt6" ] }, { @@ -63,20 +58,7 @@ "displayName": "Build with Asan support.", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "ECM_ENABLE_SANITIZERS" : "'address;undefined'", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - }, - "inherits": [ - "base" - ] - }, - { - "name": "pch", - "displayName": "Build with PCH support.", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "ECM_ENABLE_SANITIZERS" : "'address;undefined'" }, "inherits": [ "base" @@ -102,8 +84,7 @@ "displayName": "Build with CMake unity support.", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "USE_UNITY_CMAKE_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "USE_UNITY_CMAKE_SUPPORT": "ON" }, "inherits": [ "base" @@ -123,8 +104,19 @@ "name": "profile", "displayName": "profile", "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + }, + "inherits": [ + "base" + ] + }, + { + "name": "coverage", + "displayName": "coverage", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_UNITY_CMAKE_SUPPORT": "OFF", + "BUILD_COVERAGE": "ON" }, "inherits": [ "base" @@ -143,21 +135,36 @@ "inherits": [ "base" ] + }, + { + "name": "pch", + "displayName": "pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_PRECOMPILED_HEADERS": "ON", + "BUILD_COVERAGE": "ON" + }, + "inherits": [ + "base" + ] } - ], "buildPresets": [ { "name": "dev", "configurePreset": "dev" }, + { + "name": "dev-mold", + "configurePreset": "dev-mold" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { - "name": "dev-disable-deprecated", - "configurePreset": "dev-disable-deprecated" + "name": "dev-clang", + "configurePreset": "dev-clang" }, { "name": "pch", @@ -168,22 +175,18 @@ "configurePreset": "release" }, { - "name": "coverage", - "configurePreset": "coverage" + "name": "unity", + "configurePreset": "unity" }, { - "name": "dev-clang", - "configurePreset": "dev-clang" + "name": "coverage", + "configurePreset": "coverage" }, - { + { "name": "asan", "configurePreset": "asan" }, { - "name": "unity", - "configurePreset": "unity" - }, - { "name": "clazy", "configurePreset": "clazy", "environment": { @@ -193,17 +196,29 @@ } ], "testPresets": [ - { + { "name": "dev", "configurePreset": "dev", "output": {"outputOnFailure": true}, "execution": {"noTestsAction": "error", "stopOnFailure": false} }, - { + { "name": "asan", "configurePreset": "asan", "output": {"outputOnFailure": true}, "execution": {"noTestsAction": "error", "stopOnFailure": true} + }, + { + "name": "unity", + "configurePreset": "unity", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + }, + { + "name": "coverage", + "configurePreset": "coverage", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} } - ] + ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/CMakePresets.json.license new/kpkpass-23.04.0/CMakePresets.json.license --- old/kpkpass-22.12.3/CMakePresets.json.license 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/CMakePresets.json.license 2023-04-02 17:36:59.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/KPimPkPassConfig.cmake.in new/kpkpass-23.04.0/KPimPkPassConfig.cmake.in --- old/kpkpass-22.12.3/KPimPkPassConfig.cmake.in 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/KPimPkPassConfig.cmake.in 2023-04-02 17:36:59.000000000 +0200 @@ -8,7 +8,17 @@ include(CMakeFindDependencyMacro) find_package(Qt@QT_MAJOR_VERSION@ "@QT_REQUIRED_VERSION@" NO_MODULE REQUIRED COMPONENTS Core Gui) -find_dependency(KF5Archive "@KF5_MIN_VERSION@") +find_dependency(KF@KF_MAJOR_VERSION@Archive "@KF_MIN_VERSION@") -include("${CMAKE_CURRENT_LIST_DIR}/KPimPkPassTargets.cmake") +if (@KPKPASS_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KPimPkPass) and KPimPkPass targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@PkPass) and KPim@KF_MAJOR_VERSION@::PkPass instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/autotests/CMakeLists.txt new/kpkpass-23.04.0/autotests/CMakeLists.txt --- old/kpkpass-22.12.3/autotests/CMakeLists.txt 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/autotests/CMakeLists.txt 2023-04-02 17:36:59.000000000 +0200 @@ -1,9 +1,9 @@ # SPDX-FileCopyrightText: 2018-2021 Volker Krause <[email protected]> -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause find_package(Qt${QT_MAJOR_VERSION}Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) add_definitions(-DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") -ecm_add_test(pkpasstest.cpp LINK_LIBRARIES Qt::Test KPim::PkPass) -ecm_add_test(fieldtest.cpp LINK_LIBRARIES Qt::Test KPim::PkPass) +ecm_add_test(pkpasstest.cpp LINK_LIBRARIES Qt::Test KPim${KF_MAJOR_VERSION}::PkPass) +ecm_add_test(fieldtest.cpp LINK_LIBRARIES Qt::Test KPim${KF_MAJOR_VERSION}::PkPass) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/autotests/fieldtest.cpp new/kpkpass-23.04.0/autotests/fieldtest.cpp --- old/kpkpass-22.12.3/autotests/fieldtest.cpp 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/autotests/fieldtest.cpp 2023-04-02 17:36:59.000000000 +0200 @@ -40,20 +40,20 @@ auto obj = QJsonDocument::fromJson(R"({"key":"valid-date","label":"Datum","dateStyle":"PKDateStyleShort","value":"2021-06-27T14:30:00+02:00"})").object(); KPkPass::Field f(obj, pass.get()); - QCOMPARE(f.value().type(), QVariant::DateTime); + QCOMPARE(f.value().userType(), QMetaType::QDateTime); QCOMPARE(f.value(), QDateTime({2021, 6, 27}, {14, 30}, Qt::OffsetFromUTC, 7200)); QCOMPARE(f.valueDisplayString(), QLatin1String("27/06/2021 14:30")); obj = QJsonDocument::fromJson(R"({"key":"valid-date","label":"Datum","dateStyle":"PKDateStyleShort","value":"2021-06-27T00:00:00+02:00"})").object(); f = KPkPass::Field(obj, pass.get()); - QCOMPARE(f.value().type(), QVariant::DateTime); + QCOMPARE(f.value().userType(), QMetaType::QDateTime); QCOMPARE(f.value().toDateTime().date(), QDate({2021, 6, 27})); QCOMPARE(f.valueDisplayString(), QLatin1String("27/06/2021")); obj = QJsonDocument::fromJson(R"({"key":"valid-locations","label":"Ort","value":"Freibad Killesberg\n"})").object(); f = KPkPass::Field(obj, pass.get()); - QCOMPARE(f.value().type(), QVariant::String); + QCOMPARE(f.value().userType(), QMetaType::QString); QCOMPARE(f.value(), QLatin1String("Freibad Killesberg\n")); QCOMPARE(f.valueDisplayString(), QLatin1String("Freibad Killesberg")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/sanitizers.supp new/kpkpass-23.04.0/sanitizers.supp --- old/kpkpass-22.12.3/sanitizers.supp 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/sanitizers.supp 2023-04-02 17:36:59.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/src/CMakeLists.txt new/kpkpass-23.04.0/src/CMakeLists.txt --- old/kpkpass-22.12.3/src/CMakeLists.txt 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/src/CMakeLists.txt 2023-04-02 17:36:59.000000000 +0200 @@ -1,12 +1,12 @@ # SPDX-FileCopyrightText: 2018 Volker Krause <[email protected]> -# SPDX-FileCopyrightText: 2019-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2019-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause -set(KDE_INSTALL_INCLUDEDIR_PIM ${KDE_INSTALL_INCLUDEDIR}/KPim) -add_library(KPimPkPass) -add_library(KPim::PkPass ALIAS KPimPkPass) +set(KDE_INSTALL_INCLUDEDIR_PIM ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}) +add_library(KPim${KF_MAJOR_VERSION}PkPass) +add_library(KPim${KF_MAJOR_VERSION}::PkPass ALIAS KPim${KF_MAJOR_VERSION}PkPass) -target_sources(KPimPkPass PRIVATE +target_sources(KPim${KF_MAJOR_VERSION}PkPass PRIVATE barcode.cpp boardingpass.cpp field.cpp @@ -20,29 +20,29 @@ barcode.h ) -ecm_qt_declare_logging_category(KPimPkPass +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}PkPass HEADER logging.h IDENTIFIER KPkPass::Log CATEGORY_NAME org.kde.pkpass DESCRIPTION "KPkPass" EXPORT KPKPASS) -generate_export_header(KPimPkPass BASE_NAME KPkPass) -set_target_properties(KPimPkPass PROPERTIES +generate_export_header(KPim${KF_MAJOR_VERSION}PkPass BASE_NAME KPkPass) +set_target_properties(KPim${KF_MAJOR_VERSION}PkPass PROPERTIES VERSION ${KPKPASS_VERSION} SOVERSION ${KPKPASS_SOVERSION} EXPORT_NAME PkPass ) -target_include_directories(KPimPkPass INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_PIM}>") -target_link_libraries(KPimPkPass +target_include_directories(KPim${KF_MAJOR_VERSION}PkPass INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_PIM}>") +target_link_libraries(KPim${KF_MAJOR_VERSION}PkPass PUBLIC Qt::Gui PRIVATE - KF5::Archive + KF${KF_MAJOR_VERSION}::Archive ) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) - set_target_properties(KPimPkPass PROPERTIES UNITY_BUILD ON) + set_target_properties(KPim${KF_MAJOR_VERSION}PkPass PROPERTIES UNITY_BUILD ON) endif() ecm_generate_headers(KPkPass_HEADERS @@ -55,7 +55,7 @@ REQUIRED_HEADERS KPkPass_HEADERS ) -install(TARGETS KPimPkPass EXPORT KPimPkPassTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KPim${KF_MAJOR_VERSION}PkPass EXPORT KPim${KF_MAJOR_VERSION}PkPassTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${KPkPass_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kpkpass_export.h @@ -70,9 +70,9 @@ if (BUILD_QCH) ecm_add_qch( - KPimPkPass_QCH - NAME KPimPkPass - BASE_NAME KPimPkPass + KPim${KF_MAJOR_VERSION}PkPass_QCH + NAME KPim${KF_MAJOR_VERSION}PkPass + BASE_NAME KPim${KF_MAJOR_VERSION}PkPass VERSION ${PIM_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API @@ -80,9 +80,9 @@ MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" LINK_QCHS - Qt5Core_QCH - Qt5Gui_QCH - Qt5Widgets_QCH + Qt${QT_MAJOR_VERSION}Core_QCH + Qt${QT_MAJOR_VERSION}Gui_QCH + Qt${QT_MAJOR_VERSION}Widgets_QCH INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-22.12.3/src/field.cpp new/kpkpass-23.04.0/src/field.cpp --- old/kpkpass-22.12.3/src/field.cpp 2023-02-02 13:16:36.000000000 +0100 +++ new/kpkpass-23.04.0/src/field.cpp 2023-04-02 17:36:59.000000000 +0200 @@ -78,7 +78,7 @@ // see // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/FieldDictionary.html#//apple_ref/doc/uid/TP40012026-CH4-SW6 // however, real-world data doesn't strictly follow that, so we have to guess a bit here... - if (v.type() == QVariant::DateTime) { + if (v.userType() == QMetaType::QDateTime) { const auto dt = v.toDateTime(); auto fmt = QLocale::ShortFormat; const auto dtStyle = d->obj.value(QLatin1String("dateStyle")).toString();
