Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2021-09-16 23:14:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Thu Sep 16 23:14:10 2021 rev:80 rq:919210 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2021-08-16 10:12:14.687052126 +0200 +++ /work/SRC/openSUSE:Factory/.kpeople5.new.1899/kpeople5.changes 2021-09-16 23:16:08.571889692 +0200 @@ -1,0 +2,15 @@ +Wed Sep 15 08:24:15 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:22:15 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- Changes since 5.85.0: + * replace "MacOSX" with "macOS" + +------------------------------------------------------------------- Old: ---- baselibs.conf kpeople-5.85.0.tar.xz kpeople-5.85.0.tar.xz.sig New: ---- kpeople-5.86.0.tar.xz kpeople-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.SS8k36/_old 2021-09-16 23:16:09.095890235 +0200 +++ /var/tmp/diff_new_pack.SS8k36/_new 2021-09-16 23:16:09.099890240 +0200 @@ -17,14 +17,14 @@ %define rname kpeople -%define _tar_path 5.85 +%define _tar_path 5.86 # 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 lang Name: kpeople5 -Version: 5.85.0 +Version: 5.86.0 Release: 0 Summary: Library for access to contacts and identity holders License: LGPL-2.1-or-later @@ -35,7 +35,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{rname}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_version} BuildRequires: kf5-filesystem BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_version} ++++++ kpeople-5.85.0.tar.xz -> kpeople-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/.git-blame-ignore-revs new/kpeople-5.86.0/.git-blame-ignore-revs --- old/kpeople-5.85.0/.git-blame-ignore-revs 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/.git-blame-ignore-revs 2021-09-04 19:04:47.000000000 +0200 @@ -1,3 +1,4 @@ -#clang-format +#clang-format/tidy 235ad894550c776b2e7482fec8c62045576f1242 b72a24762a5a145e699678fd497349e5b57d3fb3 +ba7b52881cd213d30e8d5fea22a4387870bb7c19 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/CMakeLists.txt new/kpeople-5.86.0/CMakeLists.txt --- old/kpeople-5.85.0/CMakeLists.txt 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/CMakeLists.txt 2021-09-04 19:04:47.000000000 +0200 @@ -1,17 +1,17 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts -set(KF_DEP_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts +set(KF_DEP_VERSION "5.86.0") # handled by release scripts project (KPeople VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Sql Widgets Qml) @@ -59,7 +59,7 @@ option(ENABLE_EXAMPLES "Build the examples" "ON") ki18n_install(po) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_definitions(-DKSERVICE_DISABLE_DEPRECATED_BEFORE_AND_AT=0x04ff00) # TODO: PersonDetailsView(QWidget *) constructor still calls KPluginInfo::fromServices() (deprecated at 5.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/examples/duplicates.cpp new/kpeople-5.86.0/examples/duplicates.cpp --- old/kpeople-5.85.0/examples/duplicates.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/examples/duplicates.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -28,13 +28,14 @@ std::cout << "Results: " << res.count() << std::endl; for (QList<Match>::iterator it = res.begin(); it != res.end();) { QStringList roles = it->matchReasons(); - QStringList rA, rB; + QStringList rA; + QStringList rB; AbstractContact::Ptr aA = it->indexA.data(PersonsModel::PersonVCardRole).value<AbstractContact::Ptr>(); AbstractContact::Ptr aB = it->indexB.data(PersonsModel::PersonVCardRole).value<AbstractContact::Ptr>(); Q_ASSERT(!it->reasons.isEmpty()); - for (Match::MatchReason i : qAsConst(it->reasons)) { + for (Match::MatchReason i : std::as_const(it->reasons)) { rA += it->matchValue(i, aA); rB += it->matchValue(i, aB); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/metainfo.yaml new/kpeople-5.86.0/metainfo.yaml --- old/kpeople-5.85.0/metainfo.yaml 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/metainfo.yaml 2021-09-04 19:04:47.000000000 +0200 @@ -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/kpeople-5.85.0/po/zh_CN/kpeople5.po new/kpeople-5.86.0/po/zh_CN/kpeople5.po --- old/kpeople-5.85.0/po/zh_CN/kpeople5.po 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/po/zh_CN/kpeople5.po 2021-09-04 19:04:47.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-06-11 00:14+0000\n" -"PO-Revision-Date: 2021-07-26 13:47\n" +"PO-Revision-Date: 2021-08-30 11:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/duplicatesfinder.cpp new/kpeople-5.86.0/src/duplicatesfinder.cpp --- old/kpeople-5.85.0/src/duplicatesfinder.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/duplicatesfinder.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -52,7 +52,7 @@ // we check if it matches int j = 0; - for (const AbstractContact::Ptr &valueToCompare : qAsConst(collectedValues)) { + for (const AbstractContact::Ptr &valueToCompare : std::as_const(collectedValues)) { QList<Match::MatchReason> matchedRoles = Match::matchAt(values, valueToCompare); if (!matchedRoles.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/matchessolver.cpp new/kpeople-5.86.0/src/matchessolver.cpp --- old/kpeople-5.85.0/src/matchessolver.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/matchessolver.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -33,7 +33,7 @@ QHash<QString, QSet<QString>> jobsData; // has a relation of each person, to know where it is QHash<QString, QString> destinationResolver; - for (const Match &m : qAsConst(m_matches)) { + for (const Match &m : std::as_const(m_matches)) { QString urlA = m.indexA.data(PersonsModel::PersonUriRole).toString(); QString urlB = m.indexB.data(PersonsModel::PersonUriRole).toString(); Q_ASSERT(urlA != urlB); @@ -75,7 +75,7 @@ } } - for (const QSet<QString> &uris : qAsConst(jobsData)) { + for (const QSet<QString> &uris : std::as_const(jobsData)) { if (PersonManager::instance()->mergeContacts(uris.values()).isEmpty()) { qCWarning(KPEOPLE_LOG) << "error: failing to merge contacts: " << uris; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/metacontact.cpp new/kpeople-5.86.0/src/metacontact.cpp --- old/kpeople-5.85.0/src/metacontact.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/metacontact.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -37,7 +37,7 @@ { if (key.startsWith(QLatin1String("all-"))) { QVariantList ret; - for (const AbstractContact::Ptr &contact : qAsConst(m_contacts)) { + for (const AbstractContact::Ptr &contact : std::as_const(m_contacts)) { QVariant val = contact->customProperty(key); Q_ASSERT(val.canConvert<QVariantList>() || val.isNull()); @@ -47,7 +47,7 @@ } return ret; } else { - for (const AbstractContact::Ptr &contact : qAsConst(m_contacts)) { + for (const AbstractContact::Ptr &contact : std::as_const(m_contacts)) { QVariant val = contact->customProperty(key); if (val.isValid()) { return val; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/persondata.cpp new/kpeople-5.86.0/src/persondata.cpp --- old/kpeople-5.85.0/src/persondata.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/persondata.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -57,7 +57,7 @@ } QMap<QString, AbstractContact::Ptr> contacts; - for (const QString &contactUri : qAsConst(d->contactUris)) { + for (const QString &contactUri : std::as_const(d->contactUris)) { // load the correct data source for this contact ID const QString sourceId = QUrl(contactUri).scheme(); Q_ASSERT(!sourceId.isEmpty()); @@ -72,8 +72,9 @@ contacts[contactUri] = cw->contact(); } connect(cw.data(), SIGNAL(contactChanged()), SLOT(onContactChanged())); - } else + } else { qCWarning(KPEOPLE_LOG) << "error: creating PersonData for unknown contact" << contactUri << id; + } } if (personUri.isEmpty() && contacts.size() == 1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/personmanager.cpp new/kpeople-5.86.0/src/personmanager.cpp --- old/kpeople-5.85.0/src/personmanager.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/personmanager.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -178,14 +178,14 @@ if (metacontacts.count() > 1) { // collect all the contacts from other persons QStringList personContacts; - for (const QString &id : qAsConst(metacontacts)) { + for (const QString &id : std::as_const(metacontacts)) { if (id != personUriString) { personContacts << contactsForPersonUri(id); } } // iterate over all of the contacts and change their personID to the new personUriString - for (const QString &id : qAsConst(personContacts)) { + for (const QString &id : std::as_const(personContacts)) { QSqlQuery updateQuery(m_db); updateQuery.prepare(QStringLiteral("UPDATE persons SET personID = ? WHERE contactID = ?")); updateQuery.bindValue(0, personUriString.mid(strlen("kpeople://"))); @@ -211,7 +211,7 @@ // process passed contacts if (!contacts.isEmpty()) { - for (const QString &id : qAsConst(contacts)) { + for (const QString &id : std::as_const(contacts)) { QSqlQuery insertQuery(m_db); insertQuery.prepare(QStringLiteral("INSERT INTO persons VALUES (?, ?)")); insertQuery.bindValue(0, id); @@ -235,7 +235,7 @@ // otherwise roll back our database changes and return an empty string if (rc) { #ifdef QT_DBUS_LIB - for (const QDBusMessage &message : qAsConst(pendingMessages)) { + for (const QDBusMessage &message : std::as_const(pendingMessages)) { QDBusConnection::sessionBus().send(message); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/personpluginmanager.cpp new/kpeople-5.86.0/src/personpluginmanager.cpp --- old/kpeople-5.85.0/src/personpluginmanager.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/personpluginmanager.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -109,10 +109,11 @@ bool KPeople::PersonPluginManager::addContact(const QVariantMap &properties) { bool ret = false; - for (auto p : qAsConst(s_instance->dataSourcePlugins)) { + for (auto p : std::as_const(s_instance->dataSourcePlugins)) { auto v2 = dynamic_cast<BasePersonsDataSourceV2 *>(p); - if (!v2) + if (!v2) { continue; + } const bool added = v2->addContact(properties); ret |= added; } @@ -122,10 +123,11 @@ bool KPeople::PersonPluginManager::deleteContact(const QString &uri) { bool ret = false; - for (auto p : qAsConst(s_instance->dataSourcePlugins)) { + for (auto p : std::as_const(s_instance->dataSourcePlugins)) { auto v2 = dynamic_cast<BasePersonsDataSourceV2 *>(p); - if (!v2) + if (!v2) { continue; + } const bool deleted = v2->deleteContact(uri); ret |= deleted; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/personsmodel.cpp new/kpeople-5.86.0/src/personsmodel.cpp --- old/kpeople-5.85.0/src/personsmodel.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/personsmodel.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -27,8 +27,8 @@ { Q_OBJECT public: - PersonsModelPrivate(PersonsModel *q) - : q(q) + PersonsModelPrivate(PersonsModel *qq) + : q(qq) { } PersonsModel *const q; @@ -248,7 +248,7 @@ QMap<QString, AbstractContact::Ptr> addresseeMap; // fetch all already loaded contacts from plugins - for (const AllContactsMonitorPtr &contactWatcher : qAsConst(m_sourceMonitors)) { + for (const AllContactsMonitorPtr &contactWatcher : std::as_const(m_sourceMonitors)) { addresseeMap.insert(contactWatcher->contacts()); } @@ -275,7 +275,7 @@ addPerson(MetaContact(i.key(), i.value())); } - for (const AllContactsMonitorPtr monitor : qAsConst(m_sourceMonitors)) { + for (const AllContactsMonitorPtr monitor : std::as_const(m_sourceMonitors)) { connect(monitor.data(), &AllContactsMonitor::contactAdded, this, &PersonsModelPrivate::onContactAdded); connect(monitor.data(), &AllContactsMonitor::contactChanged, this, &PersonsModelPrivate::onContactChanged); connect(monitor.data(), &AllContactsMonitor::contactRemoved, this, &PersonsModelPrivate::onContactRemoved); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/personssortfilterproxymodel.cpp new/kpeople-5.86.0/src/personssortfilterproxymodel.cpp --- old/kpeople-5.85.0/src/personssortfilterproxymodel.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/personssortfilterproxymodel.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -45,8 +45,9 @@ const QModelIndex idx = sourceModel()->index(source_row, 0, source_parent); Q_ASSERT(idx.isValid()); - if (!QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent)) + if (!QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent)) { return false; + } const AbstractContact::Ptr contact = idx.data(KPeople::PersonsModel::PersonVCardRole).value<AbstractContact::Ptr>(); Q_ASSERT(contact); @@ -56,7 +57,7 @@ return true; } - for (const QString &key : qAsConst(d->m_keys)) { + for (const QString &key : std::as_const(d->m_keys)) { if (!contact->customProperty(key).isNull()) { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/widgets/mergedialog.cpp new/kpeople-5.86.0/src/widgets/mergedialog.cpp --- old/kpeople-5.85.0/src/widgets/mergedialog.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/widgets/mergedialog.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -170,7 +170,7 @@ QStandardItem *parent = itemMergeContactFromMatch(true, i->first()); rootItem->appendRow(parent); - for (const Match &matchChild : qAsConst(*i)) { + for (const Match &matchChild : std::as_const(*i)) { parent->appendRow(itemMergeContactFromMatch(false, matchChild)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.85.0/src/widgets/persondetailsview.cpp new/kpeople-5.86.0/src/widgets/persondetailsview.cpp --- old/kpeople-5.85.0/src/widgets/persondetailsview.cpp 2021-08-06 11:08:39.000000000 +0200 +++ new/kpeople-5.86.0/src/widgets/persondetailsview.cpp 2021-09-04 19:04:47.000000000 +0200 @@ -181,7 +181,7 @@ d->m_personDetailsPresentation->presencePixmapLabel->setPixmap(QIcon::fromTheme(d->m_person->presenceIconName()).pixmap(32, 32)); // FIXME d->m_personDetailsPresentation->nameLabel->setText(d->m_person->name()); - for (AbstractFieldWidgetFactory *widgetFactory : qAsConst(d->m_plugins)) { + for (AbstractFieldWidgetFactory *widgetFactory : std::as_const(d->m_plugins)) { const QString label = widgetFactory->label() + QLatin1Char(':'); QWidget *widget = widgetFactory->createDetailsWidget(d->m_person->personUri(), this);
