Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2019-12-18 14:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Wed Dec 18 14:41:26 2019 rev:59 rq:757055 version:5.65.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2019-11-12 11:49:21.942968921 +0100 +++ /work/SRC/openSUSE:Factory/.kpeople5.new.4691/kpeople5.changes 2019-12-18 14:43:09.069796808 +0100 @@ -1,0 +2,12 @@ +Sun Dec 8 11:18:46 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.65.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.65.0.php +- Changes since 5.64.0: + * Allow triggering sort from QML + * Port deprecated method + * Make it compile with qt >= 5.14 without deprecated method + +------------------------------------------------------------------- Old: ---- kpeople-5.64.0.tar.xz kpeople-5.64.0.tar.xz.sig New: ---- kpeople-5.65.0.tar.xz kpeople-5.65.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.4gWS6M/_old 2019-12-18 14:43:09.957797215 +0100 +++ /var/tmp/diff_new_pack.4gWS6M/_new 2019-12-18 14:43:09.961797216 +0100 @@ -1,7 +1,7 @@ # # spec file for package kpeople5 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ %define rname kpeople -%define _tar_path 5.64 +%define _tar_path 5.65 # 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.64.0 +Version: 5.65.0 Release: 0 Summary: Library for access to contacts and identity holders License: LGPL-2.1-or-later ++++++ kpeople-5.64.0.tar.xz -> kpeople-5.65.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.64.0/CMakeLists.txt new/kpeople-5.65.0/CMakeLists.txt --- old/kpeople-5.64.0/CMakeLists.txt 2019-11-02 13:59:33.000000000 +0100 +++ new/kpeople-5.65.0/CMakeLists.txt 2019-12-07 22:46:50.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.64.0") # handled by release scripts -set(KF5_DEP_VERSION "5.64.0") # handled by release scripts +set(KF5_VERSION "5.65.0") # handled by release scripts +set(KF5_DEP_VERSION "5.65.0") # handled by release scripts project (KPeople VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.64.0 NO_MODULE) +find_package(ECM 5.65.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -58,7 +58,6 @@ endif () add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) 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.64.0/po/zh_CN/kpeople5.po new/kpeople-5.65.0/po/zh_CN/kpeople5.po --- old/kpeople-5.64.0/po/zh_CN/kpeople5.po 2019-11-02 13:59:33.000000000 +0100 +++ new/kpeople-5.65.0/po/zh_CN/kpeople5.po 2019-12-07 22:46:50.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-17 02:53+0200\n" -"PO-Revision-Date: 2019-10-09 09:45\n" +"PO-Revision-Date: 2019-11-19 23:01\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.64.0/src/declarative/peopleqmlplugin.cpp new/kpeople-5.65.0/src/declarative/peopleqmlplugin.cpp --- old/kpeople-5.64.0/src/declarative/peopleqmlplugin.cpp 2019-11-02 13:59:33.000000000 +0100 +++ new/kpeople-5.65.0/src/declarative/peopleqmlplugin.cpp 2019-12-07 22:46:50.000000000 +0100 @@ -62,7 +62,11 @@ qmlRegisterType<KPeople::PersonsSortFilterProxyModel>(uri, 1, 0, "PersonsSortFilterProxyModel"); qmlRegisterType<KPeople::PersonActionsModel>(uri, 1, 0, "PersonActions"); qmlRegisterType<DeclarativePersonData>(uri, 1, 0, "PersonData"); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) qmlRegisterType<KPeople::PersonData>(); +#else + qmlRegisterAnonymousType<KPeople::PersonData>(uri, 1); +#endif qmlRegisterUncreatableType<ActionTypeWrapper>(uri, 1, 0, "ActionType", QStringLiteral("You cannot create ActionType")); qmlRegisterSingletonType<DeclarativePersonPluginManager>(uri, 1, 0, "PersonPluginManager", [] (QQmlEngine*, QJSEngine*) -> QObject* { return new DeclarativePersonPluginManager; }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.64.0/src/matchessolver.cpp new/kpeople-5.65.0/src/matchessolver.cpp --- old/kpeople-5.64.0/src/matchessolver.cpp 2019-11-02 13:59:33.000000000 +0100 +++ new/kpeople-5.65.0/src/matchessolver.cpp 2019-12-07 22:46:50.000000000 +0100 @@ -87,7 +87,7 @@ } for (const QSet<QString> &uris : qAsConst(jobsData)) { - if (PersonManager::instance()->mergeContacts(uris.toList()).isEmpty()) { + 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.64.0/src/personssortfilterproxymodel.cpp new/kpeople-5.65.0/src/personssortfilterproxymodel.cpp --- old/kpeople-5.64.0/src/personssortfilterproxymodel.cpp 2019-11-02 13:59:33.000000000 +0100 +++ new/kpeople-5.65.0/src/personssortfilterproxymodel.cpp 2019-12-07 22:46:50.000000000 +0100 @@ -76,4 +76,8 @@ return false; } +void PersonsSortFilterProxyModel::sort(int column, Qt::SortOrder order) +{ + QSortFilterProxyModel::sort(column, order); +} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.64.0/src/personssortfilterproxymodel.h new/kpeople-5.65.0/src/personssortfilterproxymodel.h --- old/kpeople-5.64.0/src/personssortfilterproxymodel.h 2019-11-02 13:59:33.000000000 +0100 +++ new/kpeople-5.65.0/src/personssortfilterproxymodel.h 2019-12-07 22:46:50.000000000 +0100 @@ -51,6 +51,8 @@ bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; + Q_INVOKABLE void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; + private: Q_DISABLE_COPY(PersonsSortFilterProxyModel)
