Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2021-11-15 15:25:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Mon Nov 15 15:25:39 2021 rev:101 rq:931112 version:5.88.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2021-10-18 22:00:49.350034122 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new.1890/kservice.changes 2021-11-15 15:26:59.797833517 +0100 @@ -1,0 +2,21 @@ +Sun Nov 7 09:13:34 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Strip 'Source' URL for faster submissions + +------------------------------------------------------------------- +Sun Nov 7 09:08:21 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.88.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.88.0 +- Changes since 5.87.0: + * Use KSERVICE_ENABLE_DEPRECATED_SINCE in header instead of BUILD variant + * cmake: Remove intermediate copy targets + * kservice.h: Silence deprecation warnings in inlined, deprecated code + * Add FreeBSD CI + * Add Android CI + * Don't use kdoctools on Android + * Fix CI deps for Android + +------------------------------------------------------------------- Old: ---- kservice-5.87.0.tar.xz kservice-5.87.0.tar.xz.sig New: ---- kservice-5.88.0.tar.xz kservice-5.88.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.yC3rFu/_old 2021-11-15 15:27:00.613833745 +0100 +++ /var/tmp/diff_new_pack.yC3rFu/_new 2021-11-15 15:27:00.617833747 +0100 @@ -16,22 +16,22 @@ # -%define _tar_path 5.87 +%define _tar_path 5.88 # 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: kservice -Version: 5.87.0 +Version: 5.88.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif # PATCH-FIX-OPENSUSE kservice-desktop-translations.patch ++++++ kservice-5.87.0.tar.xz -> kservice-5.88.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/.gitlab-ci.yml new/kservice-5.88.0/.gitlab-ci.yml --- old/kservice-5.87.0/.gitlab-ci.yml 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/.gitlab-ci.yml 2021-11-06 14:24:31.000000000 +0100 @@ -3,3 +3,5 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/.kde-ci.yml new/kservice-5.88.0/.kde-ci.yml --- old/kservice-5.87.0/.kde-ci.yml 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/.kde-ci.yml 2021-11-06 14:24:31.000000000 +0100 @@ -1,11 +1,14 @@ Dependencies: -- 'on': ['Linux', 'FreeBSD', 'Windows', 'macOS'] +- 'on': ['@all'] 'require': 'frameworks/extra-cmake-modules': '@same' 'frameworks/kconfig' : '@same' 'frameworks/kcoreaddons' : '@same' - 'frameworks/kdbusaddons' : '@same' 'frameworks/ki18n' : '@same' + +- 'on': ['Linux', 'FreeBSD', 'Windows', 'macOS'] + 'require': + 'frameworks/kdbusaddons' : '@same' 'frameworks/kdoctools' : '@same' Options: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/CMakeLists.txt new/kservice-5.88.0/CMakeLists.txt --- old/kservice-5.87.0/CMakeLists.txt 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/CMakeLists.txt 2021-11-06 14:24:31.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.87.0") # handled by release scripts +set(KF_VERSION "5.88.0") # handled by release scripts set(KF_DEP_VERSION "5.87.0") # handled by release scripts project(KService VERSION ${KF_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/autotests/kmimeassociationstest.cpp new/kservice-5.88.0/autotests/kmimeassociationstest.cpp --- old/kservice-5.87.0/autotests/kmimeassociationstest.cpp 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/autotests/kmimeassociationstest.cpp 2021-11-06 14:24:31.000000000 +0100 @@ -32,7 +32,7 @@ : KServiceFactory(db) { } - ~FakeServiceFactory(); + ~FakeServiceFactory() override; KService::Ptr findServiceByMenuId(const QString &name) override { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/po/ca/kservice5.po new/kservice-5.88.0/po/ca/kservice5.po --- old/kservice-5.87.0/po/ca/kservice5.po 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/po/ca/kservice5.po 2021-11-06 14:24:31.000000000 +0100 @@ -6,7 +6,7 @@ # Sebasti?? Pla i Sanz <s...@sastia.com>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella P??rez <antonibel...@yahoo.com>, 2003, 2006, 2011, 2012, 2013, 2014, 2015, 2020. # Albert Astals Cid <aa...@kde.org>, 2004, 2005, 2007. -# Josep Ma. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2021. +# Josep M. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2021. # Robert Millan <r...@aybabtu.com>, 2009. # Orestes Mas <ores...@tsc.upc.edu>, 2010. msgid "" @@ -14,21 +14,21 @@ "Project-Id-Version: kservice\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-09-19 00:15+0000\n" -"PO-Revision-Date: 2021-05-20 10:09+0100\n" -"Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" +"PO-Revision-Date: 2021-10-10 14:27+0200\n" +"Last-Translator: Josep M. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.12.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Sebasti?? Pla,Antoni Bella,Albert Astals,Josep Ma. Ferrer" +msgstr "Sebasti?? Pla,Antoni Bella,Albert Astals,Josep M. Ferrer" #, kde-format msgctxt "EMAIL OF TRANSLATORS" @@ -77,7 +77,7 @@ msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "No senyalis aplicacions a actualitzar (obsolet, ja no t?? cap efecte)" +msgstr "No assenyalis aplicacions a actualitzar (obsolet, ja no t?? cap efecte)" #: kbuildsycoca/kbuildsycoca_main.cpp:105 #, kde-format @@ -115,7 +115,7 @@ msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" msgstr "" -"Commuta ??QStandardPaths?? al mode de prova, nom??s per a les proves unit??ries." +"Commuta ??QStandardPaths?? al mode de prova, nom??s per a les proves unit??ries" #: kdeinit/ktoolinvocation.cpp:60 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/po/fr/kservice5.po new/kservice-5.88.0/po/fr/kservice5.po --- old/kservice-5.87.0/po/fr/kservice5.po 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/po/fr/kservice5.po 2021-11-06 14:24:31.000000000 +0100 @@ -23,7 +23,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-09-19 00:15+0000\n" -"PO-Revision-Date: 2021-05-21 09:05+0200\n" +"PO-Revision-Date: 2021-10-06 15:37+0200\n" "Last-Translator: Xavier Besnard <xavier.besn...@neuf.fr>\n" "Language-Team: French <kde-francoph...@kde.org>\n" "Language: fr\n" @@ -31,7 +31,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 21.04.1\n" +"X-Generator: Lokalize 21.08.1\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -39,12 +39,12 @@ #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Jo??lle Cornavin,Matthieu Robin, S??bastien Renard, Vincent Pinon" +msgstr "Jo??lle Cornavin, Matthieu Robin, S??bastien Renard, Vincent Pinon" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "jc...@free.fr,k...@macolu.org,ren...@kde.org,vpi...@kde.org" +msgstr "jc...@free.fr, k...@macolu.org, ren...@kde.org, vpi...@kde.org" #: kbuildsycoca/kbuildsycoca_main.cpp:90 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/po/vi/kservice5.po new/kservice-5.88.0/po/vi/kservice5.po --- old/kservice-5.87.0/po/vi/kservice5.po 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/po/vi/kservice5.po 2021-11-06 14:24:31.000000000 +0100 @@ -4,14 +4,14 @@ # Clytie Siddall <cly...@riverland.net.au>, 2006-2007. # Ho??ng ?????c Hi???u <hieu.d.ho...@gmail.com>, 2008, 2011. # L?? Ho??ng Ph????ng <herophuon...@gmail.com>, 2011, 2012. -# Phu Hung Nguyen <phuhngu...@disroot.org>, 2020, 2021. +# Phu Hung Nguyen <phu.ngu...@kdemail.net>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-09-19 00:15+0000\n" "PO-Revision-Date: 2021-07-30 09:59+0200\n" -"Last-Translator: Phu Hung Nguyen <phuhngu...@disroot.org>\n" +"Last-Translator: Phu Hung Nguyen <phu.ngu...@kdemail.net>\n" "Language-Team: Vietnamese <kde-l10n...@kde.org>\n" "Language: vi\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/po/zh_CN/kservice5.po new/kservice-5.88.0/po/zh_CN/kservice5.po --- old/kservice-5.87.0/po/zh_CN/kservice5.po 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/po/zh_CN/kservice5.po 2021-11-06 14:24:31.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-09-19 00:15+0000\n" -"PO-Revision-Date: 2021-09-27 13:08\n" +"PO-Revision-Date: 2021-10-29 13:25\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/CMakeLists.txt new/kservice-5.88.0/src/CMakeLists.txt --- old/kservice-5.87.0/src/CMakeLists.txt 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/CMakeLists.txt 2021-11-06 14:24:31.000000000 +0100 @@ -121,7 +121,7 @@ GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 5.70 5.71 5.79 5.80 5.81 5.82 5.83 5.86 5.87 + DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 5.70 5.71 5.79 5.80 5.81 5.82 5.83 5.86 5.87 5.88 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) set(kservice_includes @@ -194,13 +194,11 @@ ) # Local copy for the unittests -add_custom_target(copy_servicetypes) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/data/kservicetypes5) -add_custom_command(TARGET copy_servicetypes PRE_BUILD COMMAND +add_custom_command(TARGET KF5Service PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/services/kplugininfo.desktop ${CMAKE_BINARY_DIR}/bin/data/kservicetypes5) # not using KDE_INSTALL_KSERVICETYPES5DIR because QStandardPaths wants "data" on Windows -add_dependencies(KF5Service copy_servicetypes) if (WIN32) install( FILES applications.menu DESTINATION ${KDE_INSTALL_DATAROOTDIR}/xdg/menus RENAME ${APPLICATIONS_MENU_NAME} ) @@ -209,13 +207,11 @@ endif () # Local copy for the unittests -add_custom_target(copy_menu) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/data/menus) -add_custom_command(TARGET copy_menu PRE_BUILD COMMAND +add_custom_command(TARGET KF5Service PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/applications.menu ${CMAKE_BINARY_DIR}/bin/data/menus/${APPLICATIONS_MENU_NAME}) -add_dependencies(KF5Service copy_menu) install(TARGETS KF5Service EXPORT KF5ServiceTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/kdeinit/ktoolinvocation.h new/kservice-5.88.0/src/kdeinit/ktoolinvocation.h --- old/kservice-5.87.0/src/kdeinit/ktoolinvocation.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/kdeinit/ktoolinvocation.h 2021-11-06 14:24:31.000000000 +0100 @@ -68,7 +68,7 @@ public: // @internal - ~KToolInvocation(); + ~KToolInvocation() override; static KToolInvocation *self(); public Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kautostart.h new/kservice-5.88.0/src/services/kautostart.h --- old/kservice-5.87.0/src/services/kautostart.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kautostart.h 2021-11-06 14:24:31.000000000 +0100 @@ -72,7 +72,7 @@ */ KSERVICE_DEPRECATED_VERSION(5, 87, "See class docs") explicit KAutostart(const QString &entryName = QString(), QObject *parent = nullptr); - ~KAutostart(); + ~KAutostart() override; /** * Flags for each of the conditions that may affect whether or not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kmimetypefactory_p.h new/kservice-5.88.0/src/services/kmimetypefactory_p.h --- old/kservice-5.87.0/src/services/kmimetypefactory_p.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kmimetypefactory_p.h 2021-11-06 14:24:31.000000000 +0100 @@ -83,7 +83,7 @@ MimeTypeEntry(const QString &file, const QString &name); MimeTypeEntry(QDataStream &s, int offset); - ~MimeTypeEntry(); + ~MimeTypeEntry() override; int serviceOffersOffset() const; void setServiceOffersOffset(int off); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kplugininfo.cpp new/kservice-5.88.0/src/services/kplugininfo.cpp --- old/kservice-5.87.0/src/services/kplugininfo.cpp 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kplugininfo.cpp 2021-11-06 14:24:31.000000000 +0100 @@ -307,7 +307,7 @@ } } -#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 88) KPluginInfo::KPluginInfo(const KService::Ptr service) : d(new KPluginInfoPrivate) { @@ -422,7 +422,7 @@ { } -#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 88) QList<KPluginInfo> KPluginInfo::fromServices(const KService::List &services, const KConfigGroup &config) { QList<KPluginInfo> infolist; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kplugininfo.h new/kservice-5.88.0/src/services/kplugininfo.h --- old/kservice-5.87.0/src/services/kplugininfo.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kplugininfo.h 2021-11-06 14:24:31.000000000 +0100 @@ -74,8 +74,7 @@ */ explicit KPluginInfo(const QString &filename /*, QStandardPaths::StandardLocation resource = ...? GenericDataLocation + services ? Is this used? */); -// Not using KSERVICE_ENABLE_DEPRECATED_SINCE because kded and kparts still need this for compat reasons -#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 88) /** * Read plugin info from a KService object. * @@ -102,8 +101,10 @@ * In the first three entries the Icon entry is optional. * @deprecated since 5.0, use (Q|K)PluginLoader instead and build the * metadata into the plugin using K_PLUGIN_CLASS_WITH_JSON( ..., "mypluginmetadata.json") + * @deprecated since 5.88, use QPluginLoader/KPluginMetaData instead and build the + * metadata into the plugins using K_PLUGIN_CLASS_WITH_JSON( ..., "mypluginmetadata.json") */ - KSERVICE_DEPRECATED_VERSION(5, 0, "Use (Q|K)PluginLoader") + KSERVICE_DEPRECATED_VERSION(5, 88, "see API docs") explicit KPluginInfo(const KService::Ptr service); #endif @@ -174,8 +175,7 @@ ~KPluginInfo(); -// Not using KSERVICE_ENABLE_DEPRECATED_SINCE because kded still need this for compat reasons -#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 88) /** * @return A list of KPluginInfo objects constructed from a list of * KService objects. If you get a trader offer of the plugins you want @@ -183,10 +183,10 @@ * * @param services The list of services to construct the list of KPluginInfo objects from * @param config The config group where to save/load whether the plugin is enabled/disabled - * @deprecated since 5.0, use (Q|K)PluginLoader instead and build the + * @deprecated since 5.88, use QPluginLoader/KPluginMetaData instead and build the * metadata into the plugins using K_PLUGIN_CLASS_WITH_JSON( ..., "mypluginmetadata.json") */ - KSERVICE_DEPRECATED_VERSION(5, 0, "Use fromMetaData and KPluginLoader(info.libraryPath())") + KSERVICE_DEPRECATED_VERSION(5, 88, "see API docs") static KPluginInfo::List fromServices(const KService::List &services, const KConfigGroup &config = KConfigGroup()); #endif @@ -346,9 +346,8 @@ * @since 5.0 */ QString libraryPath() const; - -// Not using KSERVICE_ENABLE_DEPRECATED_SINCE because kcmutils still needs this for compat reasons -#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 70) + // visibility check set to a later version because the BUILD variant was used before +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 88) /** * @return The KService object for this plugin. You might need it if you * want to read custom values. To do this you need to define diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kservice.h new/kservice-5.88.0/src/services/kservice.h --- old/kservice-5.87.0/src/services/kservice.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kservice.h 2021-11-06 14:24:31.000000000 +0100 @@ -78,7 +78,7 @@ KService(const KService &other); - virtual ~KService(); + ~KService() override; /** * Services are either applications (executables) or dlopened libraries (plugins). @@ -586,6 +586,9 @@ KSERVICE_DEPRECATED_VERSION(5, 86, "Use KPluginMetaData/KPluginFactory or QPluginloader instead") T *createInstance(QWidget *parentWidget, QObject *parent, const QVariantList &args = QVariantList(), QString *error = nullptr) const { + QT_WARNING_PUSH + QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") + QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") KPluginLoader pluginLoader(*this); KPluginFactory *factory = pluginLoader.factory(); if (factory) { @@ -600,6 +603,7 @@ *error = pluginLoader.errorString(); pluginLoader.unload(); } + QT_WARNING_POP return nullptr; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kservicegroup.h new/kservice-5.88.0/src/services/kservicegroup.h --- old/kservice-5.87.0/src/services/kservicegroup.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kservicegroup.h 2021-11-06 14:24:31.000000000 +0100 @@ -81,7 +81,7 @@ */ KServiceGroup(const QString &_fullpath, const QString &_relpath); - virtual ~KServiceGroup(); + ~KServiceGroup() override; /** * Returns the relative path of the service group. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kservicegroup_p.h new/kservice-5.88.0/src/services/kservicegroup_p.h --- old/kservice-5.87.0/src/services/kservicegroup_p.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kservicegroup_p.h 2021-11-06 14:24:31.000000000 +0100 @@ -92,7 +92,7 @@ * Construct a service separator */ KServiceSeparator(); - ~KServiceSeparator(); + ~KServiceSeparator() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kservicetype.h new/kservice-5.88.0/src/services/kservicetype.h --- old/kservice-5.87.0/src/services/kservicetype.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kservicetype.h 2021-11-06 14:24:31.000000000 +0100 @@ -48,7 +48,7 @@ */ explicit KServiceType(KDesktopFile *config); - virtual ~KServiceType(); + ~KServiceType() override; /** * Returns the descriptive comment associated, if any. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/services/kservicetype_p.h new/kservice-5.88.0/src/services/kservicetype_p.h --- old/kservice-5.87.0/src/services/kservicetype_p.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/services/kservicetype_p.h 2021-11-06 14:24:31.000000000 +0100 @@ -33,7 +33,7 @@ { } - virtual ~KServiceTypePrivate() + ~KServiceTypePrivate() override { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/src/sycoca/vfolder_menu_p.h new/kservice-5.88.0/src/sycoca/vfolder_menu_p.h --- old/kservice-5.87.0/src/sycoca/vfolder_menu_p.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/src/sycoca/vfolder_menu_p.h 2021-11-06 14:24:31.000000000 +0100 @@ -55,7 +55,7 @@ }; VFolderMenu(KServiceFactory *serviceFactory, KBuildSycocaInterface *kbuildsycocaInterface); - ~VFolderMenu(); + ~VFolderMenu() override; /** * Parses VFolder menu definition and generates a menu layout. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.87.0/tests/pluginlocator/plugintest.h new/kservice-5.88.0/tests/pluginlocator/plugintest.h --- old/kservice-5.87.0/tests/pluginlocator/plugintest.h 2021-10-02 16:32:20.000000000 +0200 +++ new/kservice-5.88.0/tests/pluginlocator/plugintest.h 2021-11-06 14:24:31.000000000 +0100 @@ -17,7 +17,7 @@ public: PluginTest(); - virtual ~PluginTest(); + ~PluginTest() override; public Q_SLOTS: int runMain();
