Hello community, here is the log from the commit of package kpeople5 for openSUSE:Leap:15.2 checked in at 2020-02-16 18:27:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kpeople5 (Old) and /work/SRC/openSUSE:Leap:15.2/.kpeople5.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Sun Feb 16 18:27:17 2020 rev:60 rq:773940 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kpeople5/kpeople5.changes 2020-01-19 15:49:31.961775421 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kpeople5.new.26092/kpeople5.changes 2020-02-16 18:28:13.094714790 +0100 @@ -1,0 +2,16 @@ +Sun Feb 2 18:07:07 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:55 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Changes since 5.66.0: + * Adjust metainfo.yaml to new tier + * Remove legacy plugin loading code + +------------------------------------------------------------------- Old: ---- kpeople-5.66.0.tar.xz kpeople-5.66.0.tar.xz.sig New: ---- kpeople-5.67.0.tar.xz kpeople-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.9q07u3/_old 2020-02-16 18:28:13.382714941 +0100 +++ /var/tmp/diff_new_pack.9q07u3/_new 2020-02-16 18:28:13.382714941 +0100 @@ -17,14 +17,14 @@ %define rname kpeople -%define _tar_path 5.66 +%define _tar_path 5.67 # 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.66.0 +Version: 5.67.0 Release: 0 Summary: Library for access to contacts and identity holders License: LGPL-2.1-or-later @@ -41,14 +41,13 @@ BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_version} BuildRequires: cmake(KF5I18n) >= %{_kf5_version} BuildRequires: cmake(KF5ItemViews) >= %{_kf5_version} -BuildRequires: cmake(KF5Service) >= %{_kf5_version} BuildRequires: cmake(KF5WidgetsAddons) >= %{_kf5_version} -BuildRequires: cmake(Qt5DBus) >= 5.11.0 -BuildRequires: cmake(Qt5Gui) >= 5.11.0 -BuildRequires: cmake(Qt5Qml) >= 5.11.0 -BuildRequires: cmake(Qt5Sql) >= 5.11.0 -BuildRequires: cmake(Qt5Test) >= 5.11.0 -BuildRequires: cmake(Qt5Widgets) >= 5.11.0 +BuildRequires: cmake(Qt5DBus) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) >= 5.12.0 +BuildRequires: cmake(Qt5Qml) >= 5.12.0 +BuildRequires: cmake(Qt5Sql) >= 5.12.0 +BuildRequires: cmake(Qt5Test) >= 5.12.0 +BuildRequires: cmake(Qt5Widgets) >= 5.12.0 %if %{with lang} Recommends: %{name}-lang %endif @@ -60,7 +59,7 @@ Summary: Library for access to contacts and identity holders Group: Development/Libraries/KDE Requires: %{name} = %{version} -Requires: cmake(Qt5Core) >= 5.11.0 +Requires: cmake(Qt5Core) >= 5.12.0 %description devel A library that provides access to all contacts and the people who hold them. @@ -73,7 +72,7 @@ %build %cmake_kf5 -d build -- -DENABLE_EXAMPLES=OFF - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kpeople-5.66.0.tar.xz -> kpeople-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/CMakeLists.txt new/kpeople-5.67.0/CMakeLists.txt --- old/kpeople-5.66.0/CMakeLists.txt 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/CMakeLists.txt 2020-02-02 13:52:39.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.66.0") # handled by release scripts -set(KF5_DEP_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts +set(KF5_DEP_VERSION "5.67.0") # handled by release scripts project (KPeople VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.66.0 NO_MODULE) +find_package(ECM 5.67.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) @@ -23,7 +23,6 @@ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED) find_package(KF5ItemViews ${KF5_DEP_VERSION} CONFIG REQUIRED) -find_package(KF5Service ${KF5_DEP_VERSION} CONFIG REQUIRED) include(KDEInstallDirs) include(KDECMakeSettings) @@ -58,7 +57,7 @@ endif () add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) add_definitions(-DKSERVICE_DISABLE_DEPRECATED_BEFORE_AND_AT=0x04ff00) # TODO: PersonDetailsView(QWidget *) constructor still calls KPluginInfo::fromServices() (deprecated at 5.0) # investigate if needed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/metainfo.yaml new/kpeople-5.67.0/metainfo.yaml --- old/kpeople-5.66.0/metainfo.yaml 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/metainfo.yaml 2020-02-02 13:52:39.000000000 +0100 @@ -1,6 +1,6 @@ maintainer: apol description: Provides access to all contacts and the people who hold them -tier: 3 +tier: 2 type: functional platforms: - name: Linux @@ -18,4 +18,4 @@ public_lib: true group: Frameworks -subgroup: Tier 3 +subgroup: Tier 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/po/zh_CN/kpeople5.po new/kpeople-5.67.0/po/zh_CN/kpeople5.po --- old/kpeople-5.66.0/po/zh_CN/kpeople5.po 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/po/zh_CN/kpeople5.po 2020-02-02 13:52:39.000000000 +0100 @@ -7,15 +7,14 @@ "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-11-19 23:01\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"PO-Revision-Date: 2020-01-20 21:48\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-trunk/messages/frameworks/kpeople5.pot\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/src/CMakeLists.txt new/kpeople-5.67.0/src/CMakeLists.txt --- old/kpeople-5.66.0/src/CMakeLists.txt 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/src/CMakeLists.txt 2020-02-02 13:52:39.000000000 +0100 @@ -34,7 +34,6 @@ KF5::I18n KF5::CoreAddons KF5::PeopleBackend - KF5::Service ) if(NOT ANDROID) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/src/personpluginmanager.cpp new/kpeople-5.67.0/src/personpluginmanager.cpp --- old/kpeople-5.66.0/src/personpluginmanager.cpp 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/src/personpluginmanager.cpp 2020-02-02 13:52:39.000000000 +0100 @@ -22,8 +22,6 @@ #include <KPluginMetaData> #include <KPluginLoader> #include <KPluginFactory> -#include <KServiceTypeTrader> -#include <KService> #include <QMutex> #include <QMutexLocker> @@ -79,19 +77,6 @@ } } - //TODO: Remove as soon as KTp sources are released with the new plugin system - const KService::List servicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/DataSource")); - for (const KService::Ptr &service : servicesList) { - BasePersonsDataSource *dataSource = service->createInstance<BasePersonsDataSource>(nullptr); - - - if (dataSource) { - dataSourcePlugins[dataSource->sourcePluginId()] = dataSource; - } else { - qCWarning(KPEOPLE_LOG) << "Failed to create data source " << service->name() << service->entryPath(); - } - } - m_loadedDataSourcePlugins = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/src/widgets/CMakeLists.txt new/kpeople-5.67.0/src/widgets/CMakeLists.txt --- old/kpeople-5.66.0/src/widgets/CMakeLists.txt 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/src/widgets/CMakeLists.txt 2020-02-02 13:52:39.000000000 +0100 @@ -28,7 +28,6 @@ KF5::WidgetsAddons KF5::PeopleBackend KF5::CoreAddons - KF5::Service ) set_target_properties (KF5PeopleWidgets PROPERTIES VERSION ${KPEOPLE_VERSION_STRING} SOVERSION ${KPEOPLE_SOVERSION} EXPORT_NAME PeopleWidgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/src/widgets/actions.cpp new/kpeople-5.67.0/src/widgets/actions.cpp --- old/kpeople-5.66.0/src/widgets/actions.cpp 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/src/widgets/actions.cpp 2020-02-02 13:52:39.000000000 +0100 @@ -23,7 +23,6 @@ #include <KPluginFactory> #include <KPluginMetaData> #include <KPeople/PersonData> -#include <KServiceTypeTrader> #include "../backends/abstractpersonaction.h" namespace KPeople @@ -44,18 +43,6 @@ if (plugin) { // qCDebug(KPEOPLE_WIDGETS_LOG) << "found plugin" << service->name(); actionPlugins << plugin; - } - } - - //TODO: Remove as soon as KTp sources are released with the new plugin system - const KService::List personServicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/Plugin")); - for (const KService::Ptr &service : personServicesList) { - AbstractPersonAction *plugin = service->createInstance<AbstractPersonAction>(nullptr); - - - if (plugin) { -// qCDebug(KPEOPLE_WIDGETS_LOG) << "found plugin" << service->name(); - actionPlugins << plugin; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.66.0/src/widgets/persondetailsview.cpp new/kpeople-5.67.0/src/widgets/persondetailsview.cpp --- old/kpeople-5.66.0/src/widgets/persondetailsview.cpp 2020-01-04 11:11:56.000000000 +0100 +++ new/kpeople-5.67.0/src/widgets/persondetailsview.cpp 2020-02-02 13:52:39.000000000 +0100 @@ -29,8 +29,6 @@ #include <KPluginMetaData> #include <KPluginLoader> #include <KPluginFactory> -#include <KPluginInfo> -#include <KServiceTypeTrader> #include "abstractfieldwidgetfactory.h" #include "plugins/emaildetailswidget.h" #include "global.h" @@ -140,18 +138,6 @@ if (f) { d->m_plugins << f; } - } - - //TODO: Remove as soon as KTp sources are released with the new plugin system - KService::List pluginList = KServiceTypeTrader::self()->query(QStringLiteral("KPeopleWidgets/Plugin")); - const QList<KPluginInfo> plugins = KPluginInfo::fromServices(pluginList); - - for (const KPluginInfo &p : plugins) { - QString error; - AbstractFieldWidgetFactory *f = p.service()->createInstance<AbstractFieldWidgetFactory>(this, QVariantList(), &error); - if (f) { - d->m_plugins << f; - } } //TODO Sort plugins
