Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpkpass for openSUSE:Factory checked in at 2021-12-13 20:39:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpkpass (Old) and /work/SRC/openSUSE:Factory/.kpkpass.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpkpass" Mon Dec 13 20:39:49 2021 rev:41 rq:937999 version:21.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpkpass/kpkpass.changes 2021-11-06 18:16:07.708825476 +0100 +++ /work/SRC/openSUSE:Factory/.kpkpass.new.2520/kpkpass.changes 2021-12-13 20:41:14.828461932 +0100 @@ -1,0 +2,28 @@ +Fri Dec 3 19:22:28 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.12.0/ +- Changes since 21.11.90: + * Enable new GitLab CI on stable branch. + +------------------------------------------------------------------- +Sat Nov 27 10:11:23 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.90 + * New feature release +- No code change since 21.11.80 + +------------------------------------------------------------------- +Sat Nov 13 17:55:52 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.80 + * New feature release +- Changes since 21.08.3: + * Allow to show header in qtc6 + * Port away from QStringRef + * Add KDE CI file + * replace "MacOSX" with "macOS" + +------------------------------------------------------------------- Old: ---- kpkpass-21.08.3.tar.xz kpkpass-21.08.3.tar.xz.sig New: ---- kpkpass-21.12.0.tar.xz kpkpass-21.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpkpass.spec ++++++ --- /var/tmp/diff_new_pack.06bxzZ/_old 2021-12-13 20:41:15.368461998 +0100 +++ /var/tmp/diff_new_pack.06bxzZ/_new 2021-12-13 20:41:15.372461999 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kpkpass -Version: 21.08.3 +Version: 21.12.0 Release: 0 Summary: Library to parse Passbook files License: LGPL-2.1-or-later ++++++ kpkpass-21.08.3.tar.xz -> kpkpass-21.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/.gitlab-ci.yml new/kpkpass-21.12.0/.gitlab-ci.yml --- old/kpkpass-21.08.3/.gitlab-ci.yml 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/.gitlab-ci.yml 2021-11-30 19:15:02.000000000 +0100 @@ -1,35 +1,8 @@ # SPDX-FileCopyrightText: 2020-2021 Laurent Montel <[email protected]> -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-reuse.yml - -build_clazy_clang_tidy: - stage: build - image: kdeorg/ci-suse-qt515 - extends: .linux - #only: - # - merge_requests - before_script: - - zypper install -y clazy - - git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git $CI_TOOLING - - git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git $CI_TOOLING/repo-metadata - - git clone --depth=1 https://invent.kde.org/sysadmin/kde-build-metadata.git $CI_TOOLING/kde-build-metadata - - git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git $CI_TOOLING/kde-dev-scripts - - script: - - export CXX=clazy - - export CC=clang - - export CXXFLAGS="-Wno-deprecated-declarations" - - export CLAZY_HEADER_FILTER='^(?!ui_)\w+.h\$' - - export CLAZY_CHECKS="level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs" - - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment production --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX - - cd build && run-clang-tidy - variables: - PLATFORM: SUSEQt5.15 - BRANCH_GROUP: stable-kf5-qt5 + - 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/.kde-ci.yml new/kpkpass-21.12.0/.kde-ci.yml --- old/kpkpass-21.08.3/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/kpkpass-21.12.0/.kde-ci.yml 2021-11-30 19:15:02.000000000 +0100 @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +Dependencies: +- 'on': ['@all'] + 'require': + 'frameworks/extra-cmake-modules': '@latest' + 'frameworks/karchive' : '@latest' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/CMakeLists.txt new/kpkpass-21.12.0/CMakeLists.txt --- old/kpkpass-21.08.3/CMakeLists.txt 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/CMakeLists.txt 2021-11-30 19:15:02.000000000 +0100 @@ -3,41 +3,47 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.3") +set(PIM_VERSION "5.19.0") project(KPkPass VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.83.0") +set(KF5_MIN_VERSION "5.87.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMAddTests) include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) include(ECMSetupVersion) include(FeatureSummary) include(KDEGitCommitHooks) +include(KDEClangFormat) +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) include(KDEInstallDirs) include(KDECMakeSettings) include(GenerateExportHeader) +include(ECMAddQch) + + +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)") ecm_setup_version(PROJECT VARIABLE_PREFIX KPKPASS VERSION_HEADER kpkpass_version.h PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimPkPassConfigVersion.cmake" ) -set(QT_REQUIRED_VERSION "5.15.0") +set(QT_REQUIRED_VERSION "5.15.2") find_package(Qt5 ${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=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) @@ -74,3 +80,13 @@ FILE KPimPkPassTargets.cmake NAMESPACE KPim:: ) + +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KPimPkPass_QCH + FILE KPimPkPassQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPimPkPassQchTargets.cmake\")") +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/CMakePresets.json new/kpkpass-21.12.0/CMakePresets.json --- old/kpkpass-21.08.3/CMakePresets.json 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/CMakePresets.json 2021-11-30 19:15:02.000000000 +0100 @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "configurePresets": [ { "name": "dev", @@ -8,8 +8,21 @@ "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-disable-deprecated", + "displayName": "Build as without deprecated methods", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-disable-deprecated", + "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" + }, + "installDir": "$env{KF5}" }, { "name": "asan", @@ -19,8 +32,21 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "ECM_ENABLE_SANITIZERS" : "'address;undefined'", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "pch", + "displayName": "Build with PCH support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "dev-clang", @@ -34,7 +60,8 @@ "environment": { "CXX": "clang++", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" }, { "name": "unity", @@ -43,9 +70,10 @@ "binaryDir": "${sourceDir}/build-unity", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "USE_UNITY_CMAKE_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "USE_UNITY_CMAKE_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "release", @@ -54,7 +82,8 @@ "binaryDir": "${sourceDir}/build-release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" - } + }, + "installDir": "$env{KF5}" }, { "name": "profile", @@ -63,8 +92,9 @@ "binaryDir": "${sourceDir}/build-profile", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "clazy", @@ -77,7 +107,8 @@ "environment": { "CXX": "clazy", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" } ], @@ -87,6 +118,14 @@ "configurePreset": "dev" }, { + "name": "dev-disable-deprecated", + "configurePreset": "dev-disable-deprecated" + }, + { + "name": "pch", + "configurePreset": "pch" + }, + { "name": "release", "configurePreset": "release" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/metainfo.yaml new/kpkpass-21.12.0/metainfo.yaml --- old/kpkpass-21.08.3/metainfo.yaml 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/metainfo.yaml 2021-11-30 19:15:02.000000000 +0100 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS - name: Android portingAid: false deprecated: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/src/CMakeLists.txt new/kpkpass-21.12.0/src/CMakeLists.txt --- old/kpkpass-21.08.3/src/CMakeLists.txt 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/src/CMakeLists.txt 2021-11-30 19:15:02.000000000 +0100 @@ -12,6 +12,12 @@ field.cpp location.cpp pass.cpp + pass.h + pass_p.h + location.h + field.h + boardingpass.h + barcode.h ) ecm_qt_declare_logging_category(KPimPkPass @@ -61,4 +67,29 @@ update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR}) endif() +if (BUILD_QCH) + ecm_add_qch( + KPimPkPass_QCH + NAME KPimPkPass + BASE_NAME KPimPkPass + VERSION ${PIM_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${KPkPass_HEADERS} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" + LINK_QCHS + Qt5Core_QCH + Qt5Gui_QCH + Qt5Widgets_QCH + INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} + BLANK_MACROS + KPKPASS_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + ecm_qt_install_logging_categories(EXPORT KPKPASS FILE org_kde_kpkpass.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/src/boardingpass.h new/kpkpass-21.12.0/src/boardingpass.h --- old/kpkpass-21.08.3/src/boardingpass.h 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/src/boardingpass.h 2021-11-30 19:15:02.000000000 +0100 @@ -20,7 +20,7 @@ Q_ENUM(TransitType) explicit BoardingPass(QObject *parent = nullptr); - ~BoardingPass(); + ~BoardingPass() override; Q_REQUIRED_RESULT TransitType transitType() const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/src/pass.cpp new/kpkpass-21.12.0/src/pass.cpp --- old/kpkpass-21.08.3/src/pass.cpp 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/src/pass.cpp 2021-11-30 19:15:02.000000000 +0100 @@ -73,7 +73,7 @@ return -1; } -static QString unquote(const QStringRef &str) +static QString unquote(QStringView str) { QString res; res.reserve(str.size()); @@ -148,7 +148,7 @@ } const auto key = catalog.mid(keyBegin, keyEnd - keyBegin); - const auto value = unquote(catalog.midRef(valueBegin, valueEnd - valueBegin)); + const auto value = unquote(QStringView(catalog).mid(valueBegin, valueEnd - valueBegin)); messages.insert(key, value); idx = valueEnd + 1; // there's at least the linebreak and/or a ';' } @@ -300,7 +300,7 @@ static QColor parseColor(const QString &s) { if (s.startsWith(QLatin1String("rgb("), Qt::CaseInsensitive)) { - const auto l = s.midRef(4, s.length() - 5).split(QLatin1Char(',')); + const auto l = QStringView(s).mid(4, s.length() - 5).split(QLatin1Char(',')); if (l.size() != 3) return {}; return QColor(l[0].trimmed().toInt(), l[1].trimmed().toInt(), l[2].trimmed().toInt()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-21.08.3/src/pass.h new/kpkpass-21.12.0/src/pass.h --- old/kpkpass-21.08.3/src/pass.h 2021-10-07 21:30:05.000000000 +0200 +++ new/kpkpass-21.12.0/src/pass.h 2021-11-30 19:15:02.000000000 +0100 @@ -63,7 +63,7 @@ Q_PROPERTY(QVariantMap field READ fieldsVariantMap CONSTANT) public: - virtual ~Pass(); + ~Pass() override; /** Type of the pass. */ enum Type { BoardingPass, Coupon, EventTicket, Generic, StoreCard };
