Hello community, here is the log from the commit of package kpkpass for openSUSE:Factory checked in at 2020-12-17 16:56:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpkpass (Old) and /work/SRC/openSUSE:Factory/.kpkpass.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpkpass" Thu Dec 17 16:56:10 2020 rev:29 rq:855226 version:20.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpkpass/kpkpass.changes 2020-11-10 13:37:46.860672877 +0100 +++ /work/SRC/openSUSE:Factory/.kpkpass.new.5145/kpkpass.changes 2020-12-17 16:56:28.885163627 +0100 @@ -1,0 +2,28 @@ +Sat Dec 5 23:17:03 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-12-apps-update +- No code change since 20.11.90 + +------------------------------------------------------------------- +Fri Nov 27 15:17:16 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 20.11.90 + * New feature release +- No code change since 20.11.80 + +------------------------------------------------------------------- +Sat Nov 14 00:02:14 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 20.11.80 + * New feature release +- Changes since 20.08.3: + * Add workarounds for known JSON syntax errors in pass.json + * Remove NO_REGENERATE_MIME as now UPDATE_XDG_MIMETYPES uses -n + * Time to increase version + * Pass QLatin1String by value (clazy check) + * Don't duplicate SPDX headers + +------------------------------------------------------------------- Old: ---- kpkpass-20.08.3.tar.xz kpkpass-20.08.3.tar.xz.sig New: ---- kpkpass-20.12.0.tar.xz kpkpass-20.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpkpass.spec ++++++ --- /var/tmp/diff_new_pack.GYziOO/_old 2020-12-17 16:56:29.405164185 +0100 +++ /var/tmp/diff_new_pack.GYziOO/_new 2020-12-17 16:56:29.405164185 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kpkpass -Version: 20.08.3 +Version: 20.12.0 Release: 0 Summary: Library to parse Passbook files License: LGPL-2.1-or-later ++++++ kpkpass-20.08.3.tar.xz -> kpkpass-20.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-20.08.3/CMakeLists.txt new/kpkpass-20.12.0/CMakeLists.txt --- old/kpkpass-20.08.3/CMakeLists.txt 2020-10-09 07:37:33.000000000 +0200 +++ new/kpkpass-20.12.0/CMakeLists.txt 2020-11-27 07:14:46.000000000 +0100 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.15.3") +set(PIM_VERSION "5.16.0") project(KPkPass VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.71.0") +set(KF5_MIN_VERSION "5.75.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -27,10 +27,9 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive) find_package(SharedMimeInfo 1.3 REQUIRED) -option(NO_REGENERATE_MIME "Don't regenerate mime file (only for developper)" FALSE ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054800) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054C00) add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_NO_KEYWORDS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-20.08.3/add_license.sh new/kpkpass-20.12.0/add_license.sh --- old/kpkpass-20.08.3/add_license.sh 2020-10-09 07:37:33.000000000 +0200 +++ new/kpkpass-20.12.0/add_license.sh 2020-11-27 07:14:46.000000000 +0100 @@ -1,6 +1,7 @@ #!/bin/bash find "$@" -name '*.h' -o -name '*.cpp' -o -name '*.qml' | grep -v /3rdparty/ | while read FILE; do + if grep -qiE "SPDX" "$FILE"; then continue; fi if grep -qiE "Copyright \(C\) [0-9, -]{4,} " "$FILE" ; then continue; fi thisfile=`basename $FILE` authorName=`git config user.name` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-20.08.3/src/CMakeLists.txt new/kpkpass-20.12.0/src/CMakeLists.txt --- old/kpkpass-20.08.3/src/CMakeLists.txt 2020-10-09 07:37:33.000000000 +0200 +++ new/kpkpass-20.12.0/src/CMakeLists.txt 2020-11-27 07:14:46.000000000 +0100 @@ -50,9 +50,7 @@ if (NOT ANDROID) install(FILES application-vnd-apple-pkpass.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) - if (NOT NO_REGENERATE_MIME) - update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) - endif() + update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) 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-20.08.3/src/pass.cpp new/kpkpass-20.12.0/src/pass.cpp --- old/kpkpass-20.08.3/src/pass.cpp 2020-10-09 07:37:33.000000000 +0200 +++ new/kpkpass-20.12.0/src/pass.cpp 2020-11-27 07:14:46.000000000 +0100 @@ -23,6 +23,7 @@ #include <QTextCodec> #include <QImage> #include <QUrl> +#include <QRegularExpression> using namespace KPkPass; @@ -155,7 +156,7 @@ return !messages.isEmpty(); } -QVector<Field> PassPrivate::fields(const QLatin1String &fieldType, const Pass *q) const +QVector<Field> PassPrivate::fields(QLatin1String fieldType, const Pass *q) const { const auto a = passData().value(fieldType).toArray(); QVector<Field> f; @@ -180,10 +181,20 @@ } std::unique_ptr<QIODevice> dev(file->createDevice()); QJsonParseError error; - const auto passObj = QJsonDocument::fromJson(dev->readAll(), &error).object(); + const auto data = dev->readAll(); + auto passObj = QJsonDocument::fromJson(data, &error).object(); if (error.error != QJsonParseError::NoError) { - qCWarning(Log) << "Error parsing pass.json:" << error.errorString(); - return nullptr; + qCWarning(Log) << "Error parsing pass.json:" << error.errorString() << error.offset; + + // try to fix some known JSON syntax errors + auto s = QString::fromUtf8(data); + s.replace(QRegularExpression(QStringLiteral(R"(\}[\s\n]*,[\s\n]*\})")), QStringLiteral("}}")); + s.replace(QRegularExpression(QStringLiteral(R"(\][\s\n]*,[\s\n]*\})")), QStringLiteral("]}")); + passObj = QJsonDocument::fromJson(s.toUtf8(), &error).object(); + if (error.error != QJsonParseError::NoError) { + qCWarning(Log) << "JSON syntax workarounds didn't help either:" << error.errorString() << error.offset; + return nullptr; + } } if (passObj.value(QLatin1String("formatVersion")).toInt() > 1) { qCWarning(Log) << "pass.json has unsupported format version!"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-20.08.3/src/pass_p.h new/kpkpass-20.12.0/src/pass_p.h --- old/kpkpass-20.08.3/src/pass_p.h 2020-10-09 07:37:33.000000000 +0200 +++ new/kpkpass-20.12.0/src/pass_p.h 2020-11-27 07:14:46.000000000 +0100 @@ -27,7 +27,7 @@ void parse(); bool parseMessages(const QString &lang); - QVector<Field> fields(const QLatin1String &fieldType, const Pass *q) const; + QVector<Field> fields(QLatin1String fieldType, const Pass *q) const; static Pass *fromData(std::unique_ptr<QIODevice> device, QObject *parent); _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
