Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdav for openSUSE:Factory checked in at 2022-08-15 19:57:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdav (Old) and /work/SRC/openSUSE:Factory/.kdav.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdav" Mon Aug 15 19:57:11 2022 rev:67 rq:994962 version:5.97.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdav/kdav.changes 2022-07-11 19:09:44.823639204 +0200 +++ /work/SRC/openSUSE:Factory/.kdav.new.1521/kdav.changes 2022-08-15 19:59:08.757214992 +0200 @@ -1,0 +2,11 @@ +Sun Aug 7 22:27:17 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.97.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.97.0 +- Changes since 5.96.0: + * Stabilize multi-fetch test + * Use a struct instead of QPair + +------------------------------------------------------------------- Old: ---- kdav-5.96.0.tar.xz kdav-5.96.0.tar.xz.sig New: ---- kdav-5.97.0.tar.xz kdav-5.97.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdav.spec ++++++ --- /var/tmp/diff_new_pack.hTzXC9/_old 2022-08-15 19:59:09.189216196 +0200 +++ /var/tmp/diff_new_pack.hTzXC9/_new 2022-08-15 19:59:09.193216207 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.96 +%define _tar_path 5.97 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kdav -Version: 5.96.0 +Version: 5.97.0 Release: 0 Summary: DAV protocol implementation License: LGPL-2.0-or-later ++++++ kdav-5.96.0.tar.xz -> kdav-5.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/.kde-ci.yml new/kdav-5.97.0/.kde-ci.yml --- old/kdav-5.96.0/.kde-ci.yml 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/.kde-ci.yml 2022-08-07 15:21:14.000000000 +0200 @@ -6,3 +6,4 @@ Options: test-before-installing: True + require-passing-tests-on: [ 'Linux', 'FreeBSD' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/CMakeLists.txt new/kdav-5.97.0/CMakeLists.txt --- old/kdav-5.96.0/CMakeLists.txt 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/CMakeLists.txt 2022-08-07 15:21:14.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.96.0") # handled by release scripts -set(KF_DEP_VERSION "5.96.0") # handled by release scripts +set(KF_VERSION "5.97.0") # handled by release scripts +set(KF_DEP_VERSION "5.97.0") # handled by release scripts project(libkdav VERSION ${KF_VERSION}) -find_package(ECM 5.96.0 CONFIG REQUIRED) +find_package(ECM 5.97.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/autotests/davcollectionsmultifetchjobtest.cpp new/kdav-5.97.0/autotests/davcollectionsmultifetchjobtest.cpp --- old/kdav-5.96.0/autotests/davcollectionsmultifetchjobtest.cpp 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/autotests/davcollectionsmultifetchjobtest.cpp 2022-08-07 15:21:14.000000000 +0200 @@ -51,15 +51,20 @@ const KDAV::DavCollection::List collections = job->collections(); QCOMPARE(collections.count(), 2); + int calDavIdx = 0; + int cardDavIdx = 1; + if (collections.at(0).contentTypes() == DavCollection::Contacts) { // put things in a defined order + std::swap(calDavIdx, cardDavIdx); + } - const KDAV::DavCollection calendar = collections.at(0); + const KDAV::DavCollection calendar = collections.at(calDavIdx); QCOMPARE(calendar.displayName(), QStringLiteral("Test1 User")); QCOMPARE(calendar.contentTypes(), DavCollection::Events | DavCollection::Todos | DavCollection::FreeBusy | DavCollection::Journal); QCOMPARE(calendar.url().url().path(), QStringLiteral("/caldav.php/test1.user/home/")); QCOMPARE(calendar.CTag(), QStringLiteral("12345")); QCOMPARE(calendar.privileges(), KDAV::Read); - const KDAV::DavCollection addressbook = collections.at(1); + const KDAV::DavCollection addressbook = collections.at(cardDavIdx); QCOMPARE(addressbook.displayName(), QStringLiteral("My Address Book")); QCOMPARE(addressbook.contentTypes(), DavCollection::Contacts); QCOMPARE(addressbook.url().url().path(), QStringLiteral("/carddav.php/test1.user/home/")); @@ -67,13 +72,13 @@ QCOMPARE(addressbook.privileges(), KDAV::All); QCOMPARE(spy.count(), 2); - QCOMPARE(int(spy.at(0).at(0).value<KDAV::Protocol>()), int(KDAV::CalDav)); - QCOMPARE(spy.at(0).at(1).toString(), calendar.url().url().toString()); - QCOMPARE(spy.at(0).at(2).toString(), url.toString()); - - QCOMPARE(int(spy.at(1).at(0).value<KDAV::Protocol>()), int(KDAV::CardDav)); - QCOMPARE(spy.at(1).at(1).toString(), addressbook.url().url().toString()); - QCOMPARE(spy.at(1).at(2).toString(), url2.toString()); + QCOMPARE(int(spy.at(calDavIdx).at(0).value<KDAV::Protocol>()), int(KDAV::CalDav)); + QCOMPARE(spy.at(calDavIdx).at(1).toString(), calendar.url().url().toString()); + QCOMPARE(spy.at(calDavIdx).at(2).toString(), url.toString()); + + QCOMPARE(int(spy.at(cardDavIdx).at(0).value<KDAV::Protocol>()), int(KDAV::CardDav)); + QCOMPARE(spy.at(cardDavIdx).at(1).toString(), addressbook.url().url().toString()); + QCOMPARE(spy.at(cardDavIdx).at(2).toString(), url2.toString()); } void DavCollectionsMultiFetchJobTest::shouldFailOnError() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/po/ca@valencia/libkdav.po new/kdav-5.97.0/po/ca@valencia/libkdav.po --- old/kdav-5.96.0/po/ca@valencia/libkdav.po 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/po/ca@valencia/libkdav.po 2022-08-07 15:21:14.000000000 +0200 @@ -72,7 +72,7 @@ "from the server.\n" "%1 (%2)." msgstr "" -"S'ha produ??t un problema amb la sol??licitud. La col??lecci?? no ha estat " +"S'ha produ??t un problema amb la sol??licitud. La col??lecci?? no ha sigut " "eliminada del servidor.\n" "%1 (%2)." @@ -98,14 +98,14 @@ "on the server.\n" "%1 (%2)." msgstr "" -"S'ha produ??t un problema amb la sol??licitud. La col??lecci?? no ha estat " +"S'ha produ??t un problema amb la sol??licitud. La col??lecci?? no ha sigut " "modificada en el servidor.\n" "%1 (%2)." #: common/daverror.cpp:124 #, kde-format msgid "No properties to change or remove" -msgstr "No hi ha cap propietat a canviar o eliminar" +msgstr "No hi ha cap propietat que s'haja de canviar o eliminar" #: common/daverror.cpp:127 #, kde-format @@ -130,7 +130,7 @@ "server.\n" "%1 (%2)." msgstr "" -"S'ha produ??t un problema amb la sol??licitud. L'element no ha estat creat en " +"S'ha produ??t un problema amb la sol??licitud. L'element no ha sigut creat en " "el servidor.\n" "%1 (%2)." @@ -141,7 +141,7 @@ "server.\n" "%1 (%2)." msgstr "" -"S'ha produ??t un problema amb la sol??licitud. L'element no ha estat eliminat " +"S'ha produ??t un problema amb la sol??licitud. L'element no ha sigut eliminat " "del servidor.\n" "%1 (%2)." @@ -152,7 +152,7 @@ "server.\n" "%1 (%2)." msgstr "" -"S'ha produ??t un problema amb la sol??licitud. L'element no ha estat modificat " +"S'ha produ??t un problema amb la sol??licitud. L'element no ha sigut modificat " "en el servidor.\n" "%1 (%2)." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/po/zh_CN/libkdav.po new/kdav-5.97.0/po/zh_CN/libkdav.po --- old/kdav-5.96.0/po/zh_CN/libkdav.po 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/po/zh_CN/libkdav.po 2022-08-07 15:21:14.000000000 +0200 @@ -1,14 +1,9 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-03-09 02:40+0100\n" -"PO-Revision-Date: 2022-07-02 10:59\n" +"PO-Revision-Date: 2022-07-30 15:54\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/src/common/daverror.cpp new/kdav-5.97.0/src/common/daverror.cpp --- old/kdav-5.96.0/src/common/daverror.cpp 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/src/common/daverror.cpp 2022-08-07 15:21:14.000000000 +0200 @@ -67,7 +67,7 @@ QString KDAV::Error::translatedJobError() const { QString err; - if (d->mJobErrorCode > 0 && d->mJobErrorCode != KIO::ERR_SLAVE_DEFINED) { + if (d->mJobErrorCode > 0 && d->mJobErrorCode != KIO::ERR_WORKER_DEFINED) { err = KIO::buildErrorString(d->mJobErrorCode, d->mErrorText); } else { err = d->mErrorText; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/src/common/davprincipalhomesetsfetchjob.cpp new/kdav-5.97.0/src/common/davprincipalhomesetsfetchjob.cpp --- old/kdav-5.96.0/src/common/davprincipalhomesetsfetchjob.cpp 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/src/common/davprincipalhomesetsfetchjob.cpp 2022-08-07 15:21:14.000000000 +0200 @@ -97,7 +97,7 @@ // KIO::DavJob does not set error() even if the HTTP status code is a 4xx or a 5xx if (davJob->error() || (responseCode >= 400 && responseCode < 600)) { QString err; - if (davJob->error() && davJob->error() != KIO::ERR_SLAVE_DEFINED) { + if (davJob->error() && davJob->error() != KIO::ERR_WORKER_DEFINED) { err = KIO::buildErrorString(davJob->error(), davJob->errorText()); } else { err = davJob->errorText(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdav-5.96.0/src/common/davprincipalsearchjob.cpp new/kdav-5.97.0/src/common/davprincipalsearchjob.cpp --- old/kdav-5.96.0/src/common/davprincipalsearchjob.cpp 2022-07-02 17:49:10.000000000 +0200 +++ new/kdav-5.97.0/src/common/davprincipalsearchjob.cpp 2022-08-07 15:21:14.000000000 +0200 @@ -32,7 +32,11 @@ QString mFilter; int mPrincipalPropertySearchSubJobCount = 0; bool mPrincipalPropertySearchSubJobSuccessful = false; - QList<QPair<QString, QString>> mFetchProperties; + struct PropertyInfo { + QString propNS; + QString propName; + }; + std::vector<PropertyInfo> mFetchProperties; QVector<DavPrincipalSearchJob::Result> mResults; }; } @@ -49,12 +53,7 @@ void DavPrincipalSearchJob::fetchProperty(const QString &name, const QString &ns) { Q_D(DavPrincipalSearchJob); - QString propNamespace = ns; - if (propNamespace.isEmpty()) { - propNamespace = QStringLiteral("DAV:"); - } - - d->mFetchProperties << QPair<QString, QString>(propNamespace, name); + d->mFetchProperties.push_back({!ns.isEmpty() ? ns : QStringLiteral("DAV:"), name}); } DavUrl DavPrincipalSearchJob::davUrl() const @@ -311,16 +310,12 @@ } // All requested properties are now under propElement, so let's find them - typedef QPair<QString, QString> PropertyPair; - for (const PropertyPair &fetchProperty : std::as_const(mFetchProperties)) { - QDomNodeList fetchNodes = propElement.elementsByTagNameNS(fetchProperty.first, fetchProperty.second); + for (const auto &[propNS, propName] : mFetchProperties) { + const QDomNodeList fetchNodes = propElement.elementsByTagNameNS(propNS, propName); + mResults.reserve(mResults.size() + fetchNodes.size()); for (int i = 0; i < fetchNodes.size(); ++i) { - QDomElement fetchElement = fetchNodes.at(i).toElement(); - DavPrincipalSearchJob::Result result; - result.propertyNamespace = fetchProperty.first; - result.property = fetchProperty.second; - result.value = fetchElement.text(); - mResults << result; + const QDomElement fetchElement = fetchNodes.at(i).toElement(); + mResults.push_back({propNS, propName, fetchElement.text()}); } } @@ -384,9 +379,8 @@ prop = query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); principalPropertySearch.appendChild(prop); - typedef QPair<QString, QString> PropertyPair; - for (const PropertyPair &fetchProperty : std::as_const(mFetchProperties)) { - QDomElement elem = query.createElementNS(fetchProperty.first, fetchProperty.second); + for (const auto &[propNS, propName] : mFetchProperties) { + QDomElement elem = query.createElementNS(propNS, propName); prop.appendChild(elem); } }
