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-08-31 13:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpkpass (Old) and /work/SRC/openSUSE:Factory/.kpkpass.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpkpass" Thu Aug 31 13:43:25 2023 rev:61 rq:1105752 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpkpass/kpkpass.changes 2023-07-07 15:47:53.824402087 +0200 +++ /work/SRC/openSUSE:Factory/.kpkpass.new.1766/kpkpass.changes 2023-08-31 13:45:29.447736055 +0200 @@ -1,0 +2,27 @@ +Sun Aug 20 13:59:56 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.08.0/ +- No code change since 23.07.90 + +------------------------------------------------------------------- +Mon Aug 14 08:03:13 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.90 + * New feature release +- No code change since 23.07.80 + +------------------------------------------------------------------- +Tue Aug 1 10:14:11 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Select pkpass message catalog based on QLocale::uiLanguages + * Don't fail on empty entries in the message catalog + * Remove CI 6 job. We will use kf6 branch for kf6 works + * Generate PACKAGE_INCLUDE_QCHTARGETS first + +------------------------------------------------------------------- Old: ---- kpkpass-23.04.3.tar.xz kpkpass-23.04.3.tar.xz.sig New: ---- kpkpass-23.08.0.tar.xz kpkpass-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpkpass.spec ++++++ --- /var/tmp/diff_new_pack.9OPM4t/_old 2023-08-31 13:45:30.659779376 +0200 +++ /var/tmp/diff_new_pack.9OPM4t/_new 2023-08-31 13:45:30.663779520 +0200 @@ -19,7 +19,7 @@ %bcond_without released %define libname libKPim5PkPass5 Name: kpkpass -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: Library to parse Passbook files License: LGPL-2.1-or-later ++++++ kpkpass-23.04.3.tar.xz -> kpkpass-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-23.04.3/.gitignore new/kpkpass-23.08.0/.gitignore --- old/kpkpass-23.04.3/.gitignore 2023-06-09 06:52:26.000000000 +0200 +++ new/kpkpass-23.08.0/.gitignore 2023-08-12 08:00:18.000000000 +0200 @@ -27,3 +27,4 @@ .idea /cmake-build* .cache +Testing/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-23.04.3/.gitlab-ci.yml new/kpkpass-23.08.0/.gitlab-ci.yml --- old/kpkpass-23.04.3/.gitlab-ci.yml 2023-06-09 06:52:26.000000000 +0200 +++ new/kpkpass-23.08.0/.gitlab-ci.yml 2023-08-12 08:00:18.000000000 +0200 @@ -6,8 +6,4 @@ - 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 - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-23.04.3/.kde-ci.yml new/kpkpass-23.08.0/.kde-ci.yml --- old/kpkpass-23.04.3/.kde-ci.yml 2023-06-09 06:52:26.000000000 +0200 +++ new/kpkpass-23.08.0/.kde-ci.yml 2023-08-12 08:00:18.000000000 +0200 @@ -7,10 +7,5 @@ '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-23.04.3/CMakeLists.txt new/kpkpass-23.08.0/CMakeLists.txt --- old/kpkpass-23.04.3/CMakeLists.txt 2023-06-09 06:52:26.000000000 +0200 +++ new/kpkpass-23.08.0/CMakeLists.txt 2023-08-12 08:00:18.000000000 +0200 @@ -3,10 +3,10 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.23.3") +set(PIM_VERSION "5.24.0") project(KPkPass VERSION ${PIM_VERSION}) -set(KF_MIN_VERSION "5.103.0") +set(KF_MIN_VERSION "5.105.0") find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -52,7 +52,7 @@ find_package(SharedMimeInfo 1.3 REQUIRED) endif() -ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.105.0) @@ -74,6 +74,16 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}PkPass") set(KPKPASS_KF5_COMPAT FALSE) +if (BUILD_QCH) + ecm_install_qch_export( + 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}/KPim${KF_MAJOR_VERSION}PkPassQchTargets.cmake\")") +endif() + configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimPkPassConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}PkPassConfig.cmake" @@ -92,15 +102,6 @@ NAMESPACE KPim${KF_MAJOR_VERSION}:: ) -if (BUILD_QCH) - ecm_install_qch_export( - 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}/KPim${KF_MAJOR_VERSION}PkPassQchTargets.cmake\")") -endif() #if (QT_MAJOR_VERSION STREQUAL "5") ## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-23.04.3/CMakePresets.json new/kpkpass-23.08.0/CMakePresets.json --- old/kpkpass-23.04.3/CMakePresets.json 2023-06-09 06:52:26.000000000 +0200 +++ new/kpkpass-23.08.0/CMakePresets.json 2023-08-12 08:00:18.000000000 +0200 @@ -41,6 +41,31 @@ ] }, { + "name": "dev-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "dev-qt6-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base-qt6" + ] + }, + + { "name": "dev-qt6", "displayName": "Build against qt6", "binaryDir": "${sourceDir}/build-qt6", @@ -158,11 +183,19 @@ "name": "dev-mold", "configurePreset": "dev-mold" }, + { + "name": "dev-qch", + "configurePreset": "dev-qch" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { + "name": "dev-qt6-qch", + "configurePreset": "dev-qt6-qch" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-23.04.3/src/pass.cpp new/kpkpass-23.08.0/src/pass.cpp --- old/kpkpass-23.04.3/src/pass.cpp 2023-06-09 06:52:26.000000000 +0200 +++ new/kpkpass-23.08.0/src/pass.cpp 2023-08-12 08:00:18.000000000 +0200 @@ -50,16 +50,21 @@ void PassPrivate::parse() { - // find the message catalog - auto lang = QLocale().name(); - auto idx = lang.indexOf(QLatin1Char('_')); - if (idx > 0) { - lang = lang.left(idx); - } - lang += QLatin1String(".lproj"); - if (!parseMessages(lang)) { - parseMessages(QStringLiteral("en.lproj")); + // find the first matching message catalog + const auto langs = QLocale().uiLanguages(); + for (auto lang : langs) { + auto idx = lang.indexOf(QLatin1Char('-')); + if (idx > 0) { + lang = lang.left(idx); + } + lang += QLatin1String(".lproj"); + if (parseMessages(lang)) { + return; + } } + + // fallback to Englis if we didn't find anything better + parseMessages(QStringLiteral("en.lproj")); } static int indexOfUnquoted(const QString &catalog, QLatin1Char c, int start) @@ -152,7 +157,7 @@ break; } const auto valueEnd = indexOfUnquoted(catalog, QLatin1Char('"'), valueBegin); - if (valueEnd <= valueBegin) { + if (valueEnd < valueBegin) { break; }
