Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpkpass for openSUSE:Factory checked in at 2022-04-24 00:19:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpkpass (Old) and /work/SRC/openSUSE:Factory/.kpkpass.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpkpass" Sun Apr 24 00:19:39 2022 rev:45 rq:971530 version:22.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpkpass/kpkpass.changes 2022-03-04 20:16:15.548793731 +0100 +++ /work/SRC/openSUSE:Factory/.kpkpass.new.1538/kpkpass.changes 2022-04-24 00:20:07.164285673 +0200 @@ -1,0 +2,29 @@ +Mon Apr 18 07:52:10 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.04.0/ + +------------------------------------------------------------------- +Fri Apr 8 18:20:21 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.90 + * New feature release + +------------------------------------------------------------------- +Wed Mar 23 08:14:36 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.80 + * New feature release +- Changes since 21.12.3: + * Fix compile without deprecated method + * Fix generate config file + * Port away from Qt6::Core5Compat + * Fix Qt version + * Adapt build system for building against qt6 + * Only install pkpass mime type when not already provided + by shared-mime-info + * Add Android CI and restore REUSE check + +------------------------------------------------------------------- Old: ---- kpkpass-21.12.3.tar.xz kpkpass-21.12.3.tar.xz.sig New: ---- kpkpass-22.04.0.tar.xz kpkpass-22.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpkpass.spec ++++++ --- /var/tmp/diff_new_pack.5yAW2u/_old 2022-04-24 00:20:07.764286126 +0200 +++ /var/tmp/diff_new_pack.5yAW2u/_new 2022-04-24 00:20:07.768286129 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: kpkpass -Version: 21.12.3 +Version: 22.04.0 Release: 0 Summary: Library to parse Passbook files License: LGPL-2.1-or-later @@ -43,7 +43,9 @@ %package -n libKPimPkPass5 Summary: Library to parse Passbook files Group: System/GUI/KDE +%if %{pkg_vcmp shared-mime-info < 2.2} Requires: %{name} +%endif %description -n libKPimPkPass5 kpkpass is a library to read and parse Apple Passbook files, such as the ones @@ -73,14 +75,16 @@ %post -n libKPimPkPass5 -p /sbin/ldconfig %postun -n libKPimPkPass5 -p /sbin/ldconfig +%if %{pkg_vcmp shared-mime-info < 2.2} +%files +%{_datadir}/mime/packages/application-vnd-apple-pkpass.xml +%endif + %files -n libKPimPkPass5 %license LICENSES/* %{_kf5_libdir}/libKPimPkPass.so.* %{_kf5_debugdir}/*.categories -%files -%{_datadir}/mime/packages/application-vnd-apple-pkpass.xml - %files devel %dir %{_includedir}/KPim/ %{_includedir}/KPim/KPkPass/ ++++++ kpkpass-21.12.3.tar.xz -> kpkpass-22.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/.gitlab-ci.yml new/kpkpass-22.04.0/.gitlab-ci.yml --- old/kpkpass-21.12.3/.gitlab-ci.yml 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/.gitlab-ci.yml 2022-04-08 13:18:17.000000000 +0200 @@ -1,8 +1,10 @@ -# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-reuse.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/CMakeLists.txt new/kpkpass-22.04.0/CMakeLists.txt --- old/kpkpass-21.12.3/CMakeLists.txt 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/CMakeLists.txt 2022-04-08 13:18:17.000000000 +0200 @@ -1,12 +1,12 @@ # SPDX-FileCopyrightText: 2018-2020 Volker Krause <[email protected]> -# SPDX-FileCopyrightText: 2018-2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2018-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.19.3") +set(PIM_VERSION "5.20.0") project(KPkPass VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.87.0") +set(KF5_MIN_VERSION "5.91.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -15,6 +15,7 @@ include(ECMAddTests) include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) +include(ECMDeprecationSettings) include(ECMSetupVersion) include(FeatureSummary) include(KDEGitCommitHooks) @@ -37,12 +38,12 @@ set(QT_REQUIRED_VERSION "5.15.2") -find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui) +find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive) find_package(SharedMimeInfo 1.3 REQUIRED) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) +ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.92.0) + option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/CMakePresets.json new/kpkpass-22.04.0/CMakePresets.json --- old/kpkpass-21.12.3/CMakePresets.json 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/CMakePresets.json 2022-04-08 13:18:17.000000000 +0200 @@ -13,6 +13,30 @@ "installDir": "$env{KF5}" }, { + "name": "coverage", + "displayName": "Build as debug", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_COVERAGE": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-qt6", + "displayName": "Build against qt6", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-qt6", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_WITH_QT6": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF6}" + }, + { "name": "dev-disable-deprecated", "displayName": "Build as without deprecated methods", "generator": "Ninja", @@ -118,6 +142,10 @@ "configurePreset": "dev" }, { + "name": "dev-qt6", + "configurePreset": "dev-qt6" + }, + { "name": "dev-disable-deprecated", "configurePreset": "dev-disable-deprecated" }, @@ -130,6 +158,10 @@ "configurePreset": "release" }, { + "name": "coverage", + "configurePreset": "coverage" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/CMakePresets.json.license new/kpkpass-22.04.0/CMakePresets.json.license --- old/kpkpass-21.12.3/CMakePresets.json.license 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/CMakePresets.json.license 2022-04-08 13:18:17.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/KPimPkPassConfig.cmake.in new/kpkpass-22.04.0/KPimPkPassConfig.cmake.in --- old/kpkpass-21.12.3/KPimPkPassConfig.cmake.in 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/KPimPkPassConfig.cmake.in 2022-04-08 13:18:17.000000000 +0200 @@ -7,7 +7,7 @@ include(CMakeFindDependencyMacro) -find_package(Qt5 @Qt5Core_VERSION_MAJOR@.@Qt5Core_VERSION_MINOR@ NO_MODULE REQUIRED COMPONENTS Core Gui) +find_package(Qt@QT_MAJOR_VERSION@ "@QT_REQUIRED_VERSION@" NO_MODULE REQUIRED COMPONENTS Core Gui) find_dependency(KF5Archive "@KF5_MIN_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KPimPkPassTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/LICENSES/BSD-3-Clause.txt new/kpkpass-22.04.0/LICENSES/BSD-3-Clause.txt --- old/kpkpass-21.12.3/LICENSES/BSD-3-Clause.txt 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/LICENSES/BSD-3-Clause.txt 2022-04-08 13:18:17.000000000 +0200 @@ -1,11 +1,26 @@ Copyright (c) <year> <owner>. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/autotests/CMakeLists.txt new/kpkpass-22.04.0/autotests/CMakeLists.txt --- old/kpkpass-21.12.3/autotests/CMakeLists.txt 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/autotests/CMakeLists.txt 2022-04-08 13:18:17.000000000 +0200 @@ -1,9 +1,9 @@ # SPDX-FileCopyrightText: 2018-2021 Volker Krause <[email protected]> -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause -find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) +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${QT_MAJOR_VERSION}::Test KPim::PkPass) +ecm_add_test(fieldtest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KPim::PkPass) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/sanitizers.supp new/kpkpass-22.04.0/sanitizers.supp --- old/kpkpass-21.12.3/sanitizers.supp 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/sanitizers.supp 2022-04-08 13:18:17.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2022 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-21.12.3/src/CMakeLists.txt new/kpkpass-22.04.0/src/CMakeLists.txt --- old/kpkpass-21.12.3/src/CMakeLists.txt 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/src/CMakeLists.txt 2022-04-08 13:18:17.000000000 +0200 @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2018 Volker Krause <[email protected]> -# SPDX-FileCopyrightText: 2019-2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2019-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause set(KDE_INSTALL_INCLUDEDIR_PIM ${KDE_INSTALL_INCLUDEDIR}/KPim) @@ -36,7 +36,7 @@ target_include_directories(KPimPkPass INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_PIM}>") target_link_libraries(KPimPkPass PUBLIC - Qt::Gui + Qt${QT_MAJOR_VERSION}::Gui PRIVATE KF5::Archive ) @@ -62,7 +62,7 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_PIM}/KPkPass ) -if (NOT ANDROID) +if (NOT ANDROID AND SharedMimeInfo_VERSION_STRING VERSION_LESS 2.2) install(FILES application-vnd-apple-pkpass.xml DESTINATION ${KDE_INSTALL_MIMEDIR}) update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR}) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.12.3/src/pass.cpp new/kpkpass-22.04.0/src/pass.cpp --- old/kpkpass-21.12.3/src/pass.cpp 2022-02-03 22:30:30.000000000 +0100 +++ new/kpkpass-22.04.0/src/pass.cpp 2022-04-08 13:18:17.000000000 +0200 @@ -22,7 +22,11 @@ #include <QJsonObject> #include <QLocale> #include <QRegularExpression> +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QTextCodec> +#else +#include <QStringDecoder> +#endif #include <QUrl> using namespace KPkPass; @@ -121,8 +125,13 @@ if (rawData.at(0) == '"') { catalog = QString::fromUtf8(rawData); } else { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) auto codec = QTextCodec::codecForName("UTF-16BE"); catalog = codec->toUnicode(rawData); +#else + auto codec = QStringDecoder(QStringDecoder::Utf16BE); + catalog = codec(rawData); +#endif } int idx = 0;
