Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2022-01-11 21:16:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Tue Jan 11 21:16:39 2022 rev:84 rq:945077 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2021-12-13 20:44:37.984486818 +0100 +++ /work/SRC/openSUSE:Factory/.kpeople5.new.1892/kpeople5.changes 2022-01-11 21:19:22.812963495 +0100 @@ -1,0 +2,12 @@ +Mon Jan 3 12:47:49 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Make it compile against qt6 + * Bump KF_DISABLE_DEPRECATED_BEFORE_AND_AT value to latest released frameworks + * Port away from deprecated KPluginLoader + +------------------------------------------------------------------- Old: ---- kpeople-5.89.0.tar.xz kpeople-5.89.0.tar.xz.sig New: ---- kpeople-5.90.0.tar.xz kpeople-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.BIzzfk/_old 2022-01-11 21:19:23.400963908 +0100 +++ /var/tmp/diff_new_pack.BIzzfk/_new 2022-01-11 21:19:23.404963911 +0100 @@ -17,21 +17,21 @@ %define rname kpeople -%define _tar_path 5.89 +%define _tar_path 5.90 # 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 +%bcond_without released Name: kpeople5 -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Library for access to contacts and identity holders License: LGPL-2.1-or-later Group: Development/Libraries/KDE URL: https://www.kde.org Source: %{rname}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{rname}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif @@ -47,9 +47,6 @@ BuildRequires: cmake(Qt5Sql) >= 5.15.0 BuildRequires: cmake(Qt5Test) >= 5.15.0 BuildRequires: cmake(Qt5Widgets) >= 5.15.0 -%if %{with lang} -Recommends: %{name}-lang -%endif %description A library that provides access to all contacts and the people who hold them. @@ -76,14 +73,14 @@ %install %kf5_makeinstall -C build -%if %{with lang} +%if %{with released} %find_lang kpeople5 %{name}.lang %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files lang -f %{name}.lang %endif ++++++ kpeople-5.89.0.tar.xz -> kpeople-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/CMakeLists.txt new/kpeople-5.90.0/CMakeLists.txt --- old/kpeople-5.89.0/CMakeLists.txt 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/CMakeLists.txt 2022-01-01 13:34:52.000000000 +0100 @@ -1,27 +1,28 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project (KPeople VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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.2) +include(KDEInstallDirs) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Sql Widgets Qml) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Sql Widgets Qml) # On non-Apple UNIX DBus integration is required, on Android it does not exist and on other platforms it is optional if(UNIX AND NOT APPLE) if(NOT ANDROID) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) endif() else() - find_package(Qt5 ${REQUIRED_QT_VERSION} OPTIONAL_COMPONENTS DBus) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} OPTIONAL_COMPONENTS DBus) endif() find_package(KF5CoreAddons ${KF_DEP_VERSION} CONFIG REQUIRED) @@ -29,7 +30,6 @@ find_package(KF5I18n ${KF_DEP_VERSION} CONFIG REQUIRED) find_package(KF5ItemViews ${KF_DEP_VERSION} CONFIG REQUIRED) -include(KDEInstallDirs) include(KDECMakeSettings) include(KDEGitCommitHooks) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) @@ -60,10 +60,7 @@ ki18n_install(po) 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) -# investigate if needed +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_subdirectory (src) if (ENABLE_EXAMPLES) add_subdirectory(examples) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/KF5PeopleConfig.cmake.in new/kpeople-5.90.0/KF5PeopleConfig.cmake.in --- old/kpeople-5.89.0/KF5PeopleConfig.cmake.in 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/KF5PeopleConfig.cmake.in 2022-01-01 13:34:52.000000000 +0100 @@ -1,8 +1,8 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) -find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Widgets @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KPeopleTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/autotests/CMakeLists.txt new/kpeople-5.90.0/autotests/CMakeLists.txt --- old/kpeople-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:34:52.000000000 +0100 @@ -1,6 +1,6 @@ -find_package(Qt5Test) +find_package(Qt${QT_MAJOR_VERSION}Test) -set(libs Qt5::Sql Qt5::Test KF5::People KF5::PeopleBackend) +set(libs Qt${QT_MAJOR_VERSION}::Sql Qt${QT_MAJOR_VERSION}::Test KF5::People KF5::PeopleBackend) ecm_add_test(TEST_NAME persondatatest persondatatests.cpp fakecontactsource.cpp LINK_LIBRARIES ${libs}) ecm_add_test(TEST_NAME personsmodeltest personsmodeltest.cpp fakecontactsource.cpp LINK_LIBRARIES ${libs}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/examples/CMakeLists.txt new/kpeople-5.90.0/examples/CMakeLists.txt --- old/kpeople-5.89.0/examples/CMakeLists.txt 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/examples/CMakeLists.txt 2022-01-01 13:34:52.000000000 +0100 @@ -1,22 +1,22 @@ add_executable(contactlistwidgets contactlistwidgets.cpp) -target_link_libraries(contactlistwidgets Qt5::Core Qt5::Widgets KF5::People) +target_link_libraries(contactlistwidgets Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Widgets KF5::People) -find_package(Qt5Quick) -if (Qt5Quick_FOUND) +find_package(Qt${QT_MAJOR_VERSION}Quick) +if (Qt${QT_MAJOR_VERSION}Quick_FOUND) qt_add_resources(contactlistqml_SRCS contactlistqml.qrc) add_executable(contactlistqml contactlistqml.cpp ${contactlistqml_SRCS}) - target_link_libraries(contactlistqml Qt5::Quick) + target_link_libraries(contactlistqml Qt${QT_MAJOR_VERSION}::Quick) endif() add_executable(personwidget personwidget.cpp) -target_link_libraries(personwidget Qt5::Core Qt5::Widgets KF5::People KF5::PeopleWidgets) +target_link_libraries(personwidget Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Widgets KF5::People KF5::PeopleWidgets) # add_executable(loadcontact loadcontact.cpp) -# target_link_libraries(loadcontact Qt5::Core Qt5::Gui KF5::People) +# target_link_libraries(loadcontact Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Gui KF5::People) add_executable(duplicates duplicates.cpp) target_link_libraries(duplicates KF5::People KF5::CoreAddons KF5::PeopleBackend) add_executable(duplicatesdialog duplicatesdialog.cpp) -target_link_libraries(duplicatesdialog KF5::PeopleWidgets Qt5::Widgets) +target_link_libraries(duplicatesdialog KF5::PeopleWidgets Qt${QT_MAJOR_VERSION}::Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/po/ca@valencia/kpeople5.po new/kpeople-5.90.0/po/ca@valencia/kpeople5.po --- old/kpeople-5.89.0/po/ca@valencia/kpeople5.po 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/po/ca@valencia/kpeople5.po 2022-01-01 13:34:52.000000000 +0100 @@ -4,14 +4,14 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Antoni Bella P??rez <[email protected]>, 2015. -# Empar <[email protected]>, 2019. +# Empar Montoro Mart??n <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: kpeople\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-06-11 00:14+0000\n" "PO-Revision-Date: 2019-06-18 13:32+0200\n" -"Last-Translator: Empar <[email protected]>\n" +"Last-Translator: Empar Montoro Mart??n <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/po/zh_CN/kpeople5.po new/kpeople-5.90.0/po/zh_CN/kpeople5.po --- old/kpeople-5.89.0/po/zh_CN/kpeople5.po 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/po/zh_CN/kpeople5.po 2022-01-01 13:34:52.000000000 +0100 @@ -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-11-30 15:21\n" +"PO-Revision-Date: 2021-12-22 14:06\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.89.0/src/CMakeLists.txt new/kpeople-5.90.0/src/CMakeLists.txt --- old/kpeople-5.89.0/src/CMakeLists.txt 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/CMakeLists.txt 2022-01-01 13:34:52.000000000 +0100 @@ -40,20 +40,20 @@ target_link_libraries (KF5People PUBLIC - Qt5::Gui + Qt${QT_MAJOR_VERSION}::Gui PRIVATE - Qt5::Sql + Qt${QT_MAJOR_VERSION}::Sql KF5::I18n KF5::CoreAddons KF5::PeopleBackend ) -if(Qt5DBus_FOUND) - target_link_libraries(KF5People PRIVATE Qt5::DBus) +if(TARGET Qt${QT_MAJOR_VERSION}::DBus) + target_link_libraries(KF5People PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() target_include_directories (KF5People PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/kpeople>" - INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople>" + INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KPeople>" ) if (MSVC) @@ -79,16 +79,16 @@ PREFIX KPeople ) install (FILES ${KPeople_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople/KPeople + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople/KPeople COMPONENT Devel ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpeople/kpeople_export.h ${KPeople_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople/kpeople COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople/kpeople COMPONENT Devel ) -install(FILES personmanager_p.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople/kpeopleprivate) +install(FILES personmanager_p.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople/kpeopleprivate) generate_export_header(KF5People EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kpeople/kpeople_export.h BASE_NAME KPeople) @@ -128,7 +128,7 @@ kpeople_data_source.desktop kpeople_plugin.desktop DESTINATION - ${KDE_INSTALL_KSERVICETYPES5DIR} + ${KDE_INSTALL_KSERVICETYPESDIR} ) ecm_qt_install_logging_categories( @@ -137,7 +137,7 @@ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) -ecm_generate_pri_file(BASE_NAME KPeople LIB_NAME KF5People DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople) +ecm_generate_pri_file(BASE_NAME KPeople LIB_NAME KF5People DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) if (ANDROID) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/src/backends/CMakeLists.txt new/kpeople-5.90.0/src/backends/CMakeLists.txt --- old/kpeople-5.89.0/src/backends/CMakeLists.txt 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/backends/CMakeLists.txt 2022-01-01 13:34:52.000000000 +0100 @@ -19,11 +19,11 @@ target_link_libraries (KF5PeopleBackend PUBLIC - Qt5::Widgets #needed for QAction, otherwise QtGui + Qt${QT_MAJOR_VERSION}::Widgets #needed for QAction, otherwise QtGui ) target_include_directories (KF5PeopleBackend PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" - INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople>" + INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KPeople>" ) install (TARGETS KF5PeopleBackend @@ -43,13 +43,13 @@ PREFIX KPeopleBackend ) install (FILES ${KPeopleBackend_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople/KPeopleBackend + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople/KPeopleBackend COMPONENT Devel ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpeoplebackend/kpeoplebackend_export.h ${KPeopleBackend_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople/kpeoplebackend COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople/kpeoplebackend COMPONENT Devel ) generate_export_header(KF5PeopleBackend EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kpeoplebackend/kpeoplebackend_export.h BASE_NAME KPeopleBackend) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/src/declarative/CMakeLists.txt new/kpeople-5.90.0/src/declarative/CMakeLists.txt --- old/kpeople-5.89.0/src/declarative/CMakeLists.txt 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/declarative/CMakeLists.txt 2022-01-01 13:34:52.000000000 +0100 @@ -10,7 +10,7 @@ ) target_link_libraries(KF5PeopleDeclarative - Qt5::Qml + Qt${QT_MAJOR_VERSION}::Qml KF5::PeopleWidgets # QAction ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/src/personpluginmanager.cpp new/kpeople-5.90.0/src/personpluginmanager.cpp --- old/kpeople-5.89.0/src/personpluginmanager.cpp 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/personpluginmanager.cpp 2022-01-01 13:34:52.000000000 +0100 @@ -10,7 +10,6 @@ #include "kpeople_debug.h" #include <KPluginFactory> -#include <KPluginLoader> #include <KPluginMetaData> #include <QMutex> @@ -44,12 +43,11 @@ void PersonPluginManagerPrivate::loadDataSourcePlugins() { - const QVector<KPluginMetaData> pluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/datasource")); - for (const KPluginMetaData &service : pluginList) { - KPluginLoader loader(service.fileName()); - KPluginFactory *factory = loader.factory(); - BasePersonsDataSource *dataSource = factory->create<BasePersonsDataSource>(); - if (dataSource) { + const QVector<KPluginMetaData> pluginList = KPluginMetaData::findPlugins(QStringLiteral("kpeople/datasource")); + for (const KPluginMetaData &data : pluginList) { + auto dataSourceResult = KPluginFactory::instantiatePlugin<BasePersonsDataSource>(data); + if (dataSourceResult) { + BasePersonsDataSource *dataSource = dataSourceResult.plugin; const QString pluginId = dataSource->sourcePluginId(); if (!dataSourcePlugins.contains(pluginId)) { dataSourcePlugins[pluginId] = dataSource; @@ -58,7 +56,7 @@ qCDebug(KPEOPLE_LOG) << "Plugin" << pluginId << "was already loaded manually, ignoring..."; } } else { - qCWarning(KPEOPLE_LOG) << "Failed to create data source " << service.name() << service.fileName(); + qCWarning(KPEOPLE_LOG) << "Failed to create data source " << dataSourceResult.errorText << data.fileName(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/src/personpluginmanager.h new/kpeople-5.90.0/src/personpluginmanager.h --- old/kpeople-5.89.0/src/personpluginmanager.h 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/personpluginmanager.h 2022-01-01 13:34:52.000000000 +0100 @@ -35,7 +35,7 @@ public: /** * Use this if you explicitly don't want KPeople to autoload all the - * available data source plugins via KPluginLoader. + * available data source plugins. * * The default behavior is to autoload them */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/src/widgets/CMakeLists.txt new/kpeople-5.90.0/src/widgets/CMakeLists.txt --- old/kpeople-5.89.0/src/widgets/CMakeLists.txt 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/widgets/CMakeLists.txt 2022-01-01 13:34:52.000000000 +0100 @@ -33,7 +33,7 @@ target_link_libraries (KF5PeopleWidgets PUBLIC KF5::People - Qt5::Widgets + Qt${QT_MAJOR_VERSION}::Widgets PRIVATE KF5::I18n KF5::ItemViews @@ -66,23 +66,23 @@ ) install (FILES ${KPeopleWidgets_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople/KPeople/Widgets + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople/KPeople/Widgets COMPONENT Devel ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpeople/widgets/kpeoplewidgets_export.h ${KPeopleWidgets_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople/kpeople/widgets COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople/kpeople/widgets COMPONENT Devel ) generate_export_header(KF5PeopleWidgets EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kpeople/widgets/kpeoplewidgets_export.h BASE_NAME KPeopleWidgets) install (FILES persondetailsplugin.desktop DESTINATION - ${KDE_INSTALL_KSERVICETYPES5DIR} + ${KDE_INSTALL_KSERVICETYPESDIR} ) -ecm_generate_pri_file(BASE_NAME KPeopleWidgets LIB_NAME KF5PeopleWidgets DEPS "widgets KPeople" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople) +ecm_generate_pri_file(BASE_NAME KPeopleWidgets LIB_NAME KF5PeopleWidgets DEPS "widgets KPeople" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KPeople) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) # make available to ecm_add_qch in parent folder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/src/widgets/actions.cpp new/kpeople-5.90.0/src/widgets/actions.cpp --- old/kpeople-5.89.0/src/widgets/actions.cpp 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/widgets/actions.cpp 2022-01-01 13:34:52.000000000 +0100 @@ -10,7 +10,6 @@ #include <KPeople/PersonData> #include <KPluginFactory> -#include <KPluginLoader> #include <KPluginMetaData> #include <QAction> @@ -20,18 +19,15 @@ static QList<AbstractPersonAction *> actionsPlugins() { QList<AbstractPersonAction *> actionPlugins; - const QVector<KPluginMetaData> personPluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/actions")); - for (const KPluginMetaData &service : personPluginList) { - KPluginLoader loader(service.fileName()); - KPluginFactory *factory = loader.factory(); - if (!factory) { - qCWarning(KPEOPLE_WIDGETS_LOG) << "Couldn't create the factory for" << service.name() << "at" << service.fileName(); - continue; - } - AbstractPersonAction *plugin = factory->create<AbstractPersonAction>(); - if (plugin) { - // qCDebug(KPEOPLE_WIDGETS_LOG) << "found plugin" << service->name(); + const QVector<KPluginMetaData> personPluginList = KPluginMetaData::findPlugins(QStringLiteral("kpeople/actions")); + for (const KPluginMetaData &data : personPluginList) { + auto pluginResult = KPluginFactory::instantiatePlugin<AbstractPersonAction>(data); + if (pluginResult) { + qCDebug(KPEOPLE_WIDGETS_LOG) << "found plugin" << data.fileName(); + AbstractPersonAction *plugin = pluginResult.plugin; actionPlugins << plugin; + } else { + qCDebug(KPEOPLE_WIDGETS_LOG) << "could not load plugin" << data.fileName() << pluginResult.errorText; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.89.0/src/widgets/persondetailsview.cpp new/kpeople-5.90.0/src/widgets/persondetailsview.cpp --- old/kpeople-5.89.0/src/widgets/persondetailsview.cpp 2021-12-04 19:41:16.000000000 +0100 +++ new/kpeople-5.90.0/src/widgets/persondetailsview.cpp 2022-01-01 13:34:52.000000000 +0100 @@ -14,7 +14,6 @@ #include "global.h" #include <KPluginFactory> -#include <KPluginLoader> #include <KPluginMetaData> #include <QFormLayout> @@ -117,17 +116,12 @@ d->m_plugins << new EmailFieldsPlugin(); // load every KPeopleWidgets Plugin - const QVector<KPluginMetaData> personPluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/widgets")); + const QVector<KPluginMetaData> personPluginList = KPluginMetaData::findPlugins(QStringLiteral("kpeople/widgets")); - for (const KPluginMetaData &service : personPluginList) { - KPluginLoader loader(service.fileName()); - KPluginFactory *factory = loader.factory(); - AbstractFieldWidgetFactory *f = factory->create<AbstractFieldWidgetFactory>(); - - Q_ASSERT(f); - if (f) { - d->m_plugins << f; - } + for (const KPluginMetaData &data : personPluginList) { + auto fieldWidgetFactoryResult = KPluginFactory::instantiatePlugin<AbstractFieldWidgetFactory>(data); + Q_ASSERT_X(fieldWidgetFactoryResult, Q_FUNC_INFO, qPrintable(fieldWidgetFactoryResult.errorText)); + d->m_plugins << fieldWidgetFactoryResult.plugin; } // TODO Sort plugins
