Hello community, here is the log from the commit of package kservice for openSUSE:Leap:15.2 checked in at 2020-05-12 11:39:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kservice (Old) and /work/SRC/openSUSE:Leap:15.2/.kservice.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Tue May 12 11:39:07 2020 rev:63 rq:802198 version:5.70.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kservice/kservice.changes 2020-04-21 19:05:48.167778735 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.kservice.new.2738/kservice.changes 2020-05-12 11:39:31.268641883 +0200 @@ -1,0 +2,11 @@ +Sun May 3 09:40:12 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.70.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.70.0 +- Changes since 5.69.0: + * Deprecate KPluginInfo::service(), since the constructor with a KService is deprecated. + * newServicePath(): Docs say add prefix but it's actually suffix + +------------------------------------------------------------------- Old: ---- kservice-5.69.0.tar.xz kservice-5.69.0.tar.xz.sig New: ---- kservice-5.70.0.tar.xz kservice-5.70.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.QyvZQX/_old 2020-05-12 11:39:31.760642916 +0200 +++ /var/tmp/diff_new_pack.QyvZQX/_new 2020-05-12 11:39:31.764642924 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.69 +%define _tar_path 5.70 # 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.69.0 +Version: 5.70.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-5.69.0.tar.xz -> kservice-5.70.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/CMakeLists.txt new/kservice-5.70.0/CMakeLists.txt --- old/kservice-5.69.0/CMakeLists.txt 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/CMakeLists.txt 2020-05-03 00:22:35.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.69.0") # handled by release scripts -set(KF5_DEP_VERSION "5.69.0") # handled by release scripts +set(KF5_VERSION "5.70.0") # handled by release scripts +set(KF5_DEP_VERSION "5.70.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.69.0 NO_MODULE) +find_package(ECM 5.70.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/CMakeLists.txt new/kservice-5.70.0/src/CMakeLists.txt --- old/kservice-5.69.0/src/CMakeLists.txt 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/CMakeLists.txt 2020-05-03 00:22:35.000000000 +0200 @@ -101,7 +101,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 + DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 5.70 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) set(kservice_includes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/services/kautostart.h new/kservice-5.70.0/src/services/kautostart.h --- old/kservice-5.69.0/src/services/kautostart.h 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/services/kautostart.h 2020-05-03 00:22:35.000000000 +0200 @@ -82,8 +82,12 @@ /** * Flags for each of the conditions that may affect whether or not * a service actually autostarted on login + * @see Conditions */ enum Condition { + /** + * no conditions set + */ NoConditions = 0x0, /** * an executable that is checked for existence by name @@ -100,6 +104,9 @@ */ CheckAll = 0xff }; + /** + * Stores a combination of #Condition values. + */ Q_DECLARE_FLAGS(Conditions, Condition) /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/services/kplugininfo.cpp new/kservice-5.70.0/src/services/kplugininfo.cpp --- old/kservice-5.69.0/src/services/kplugininfo.cpp 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/services/kplugininfo.cpp 2020-05-03 00:22:35.000000000 +0200 @@ -581,11 +581,13 @@ return d->metaData.serviceTypes() + d->metaData.mimeTypes(); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 70) KService::Ptr KPluginInfo::service() const { KPLUGININFO_ISVALID_ASSERTION; return d->service; } +#endif QList<KService::Ptr> KPluginInfo::kcmServices() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/services/kplugininfo.h new/kservice-5.70.0/src/services/kplugininfo.h --- old/kservice-5.69.0/src/services/kplugininfo.h 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/services/kplugininfo.h 2020-05-03 00:22:35.000000000 +0200 @@ -44,6 +44,9 @@ class KSERVICE_EXPORT KPluginInfo { public: + /** + * A list of KPluginInfo objects. + */ typedef QList<KPluginInfo> List; /** @@ -196,7 +199,7 @@ * @deprecated since 5.0, use (Q|K)PluginLoader 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, 0, "Use fromMetaData and KPluginLoader(info.libraryPath())") static KPluginInfo::List fromServices(const KService::List &services, const KConfigGroup &config = KConfigGroup()); #endif @@ -363,6 +366,8 @@ */ QString libraryPath() const; +// Not using KSERVICE_ENABLE_DEPRECATED_SINCE because kcmutils still needs this for compat reasons +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 70) /** * @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 @@ -371,8 +376,12 @@ * keys. * * @see property() + * + * @deprecated since 5.70, use KPluginMetaData and KPluginLoader(info.libraryPath()) */ + KSERVICE_DEPRECATED_VERSION(5, 70, "Use KPluginMetaData and KPluginLoader(info.libraryPath())") KService::Ptr service() const; +#endif /** * @return A list of Service pointers if the plugin installs one or more diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/services/kservice.cpp new/kservice-5.70.0/src/services/kservice.cpp --- old/kservice-5.69.0/src/services/kservice.cpp 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/services/kservice.cpp 2020-05-03 00:22:35.000000000 +0200 @@ -97,9 +97,9 @@ return;*/ m_strType = QStringLiteral("Application"); } else if (m_strType != QLatin1String("Application") && m_strType != QLatin1String("Service")) { - qCWarning(SERVICES) << "The desktop entry file " << entryPath - << " has Type=" << m_strType - << " instead of \"Application\" or \"Service\""; + qCWarning(SERVICES) << "The desktop entry file" << entryPath + << "has Type=" << m_strType + << "instead of \"Application\" or \"Service\""; m_bValid = false; return; } @@ -884,8 +884,8 @@ { Q_D(const KService); if (d->m_strType == QLatin1String("Application") && d->m_strExec.isEmpty()) { - qCWarning(SERVICES) << "The desktop entry file " << entryPath() - << " has Type=" << d->m_strType << " but has no Exec field."; + qCWarning(SERVICES) << "The desktop entry file" << entryPath() + << "has Type=" << d->m_strType << "but has no Exec field."; } return d->m_strExec; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/services/kservice.h new/kservice-5.70.0/src/services/kservice.h --- old/kservice-5.69.0/src/services/kservice.h 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/services/kservice.h 2020-05-03 00:22:35.000000000 +0200 @@ -57,7 +57,13 @@ class KSERVICE_EXPORT KService : public KSycocaEntry { public: + /** + * A shared data pointer for KService. + */ typedef QExplicitlySharedDataPointer<KService> Ptr; + /** + * A list of shared data pointers for KService. + */ typedef QList<Ptr> List; /** @@ -493,8 +499,9 @@ * @param showInMenu true, if the service should be shown in the KDE menu * false, if the service should be hidden from the menu * This argument isn't used anymore, use NoDisplay=true to hide the service. - * @param suggestedName name to base the file on, if a service with such - * name already exists, a prefix will be added to make it unique. + * @param suggestedName name to base the file on, if a service with such a + * name already exists, a suffix will be added to make it unique + * (e.g. foo.desktop, foo-1.desktop, foo-2.desktop). * @param menuId If provided, menuId will be set to the menu id to use for * the KService * @param reservedMenuIds If provided, the path and menu id will be chosen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/services/kservicegroup.h new/kservice-5.70.0/src/services/kservicegroup.h --- old/kservice-5.69.0/src/services/kservicegroup.h 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/services/kservicegroup.h 2020-05-03 00:22:35.000000000 +0200 @@ -64,8 +64,17 @@ { friend class KBuildServiceGroupFactory; public: + /** + * A shared data pointer for KServiceGroup. + */ typedef QExplicitlySharedDataPointer<KServiceGroup> Ptr; + /** + * A shared data pointer for KSycocaEntry. + */ typedef QExplicitlySharedDataPointer<KSycocaEntry> SPtr; + /** + * A list of shared data pointers for KSycocaEntry. + */ typedef QList<SPtr> List; public: /** @@ -195,14 +204,18 @@ /** * options for groupEntries and serviceEntries + * @see EntriesOptions */ enum EntriesOption { - NoOptions = 0x0, + NoOptions = 0x0, /**< no options set */ SortEntries = 0x1, /**< sort items */ ExcludeNoDisplay = 0x2, /**< exclude items marked "NoDisplay" */ AllowSeparators = 0x4, /**< allow separator items to be included */ SortByGenericName = 0x8 /**< sort by GenericName+Name instead of Name+GenericName */ }; + /** + * Stores a combination of #EntriesOption values. + */ Q_DECLARE_FLAGS(EntriesOptions, EntriesOption) /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/services/kservicetype.h new/kservice-5.70.0/src/services/kservicetype.h --- old/kservice-5.69.0/src/services/kservicetype.h 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/services/kservicetype.h 2020-05-03 00:22:35.000000000 +0200 @@ -45,7 +45,13 @@ class KSERVICE_EXPORT KServiceType : public KSycocaEntry // TODO KDE5: inherit kshared, but move KSycocaEntry to KServiceTypePrivate { public: + /** + * A shared data pointer for KServiceType. + */ typedef QExplicitlySharedDataPointer<KServiceType> Ptr; + /** + * A list of shared data pointers for KServiceType. + */ typedef QList<Ptr> List; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/sycoca/kbuildservicefactory.cpp new/kservice-5.70.0/src/sycoca/kbuildservicefactory.cpp --- old/kservice-5.69.0/src/sycoca/kbuildservicefactory.cpp 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/sycoca/kbuildservicefactory.cpp 2020-05-03 00:22:35.000000000 +0200 @@ -305,16 +305,16 @@ for (const QString &otherType : lst) { // Skip derived types if the base class is listed (#321706) if (stName != otherType && mime.inherits(otherType)) { - // But don't skip aliases (they got resolved into mime->name() already, but don't let two aliases cancel out) + // But don't skip aliases (they got resolved into mime.name() already, but don't let two aliases cancel out) if (db.mimeTypeForName(otherType).name() != mime.name()) { - //qCDebug(SYCOCA) << "Skipping" << mime->name() << "because of" << otherType << "(canonical" << KMimeTypeRepository::self()->canonicalName(otherType) << ") while parsing" << service->entryPath(); + //qCDebug(SYCOCA) << "Skipping" << mime.name() << "because of" << otherType << "(canonical" << db.mimeTypeForName(otherType) << ") while parsing" << service->entryPath(); shouldAdd = false; } } } if (shouldAdd) { - //qCDebug(SYCOCA) << "Adding service" << service->entryPath() << "to" << mime->name(); - m_offerHash.addServiceOffer(mime.name(), offer); // mime->name so that we resolve aliases + //qCDebug(SYCOCA) << "Adding service" << service->entryPath() << "to" << mime.name(); + m_offerHash.addServiceOffer(mime.name(), offer); // mime.name() so that we resolve aliases } } } @@ -398,7 +398,7 @@ for (QList<KServiceOffer>::const_iterator it2 = offers.constBegin(); it2 != offers.constEnd(); ++it2) { - //qCDebug(SYCOCA) << stName << ":" << "writing offer" << (*it2).service()->desktopEntryName() << offset << (*it2).service()->offset() << "in sycoca at pos" << str.device()->pos(); + //qCDebug(SYCOCA) << stName << ": writing offer" << (*it2).service()->desktopEntryName() << offset << (*it2).service()->offset() << "in sycoca at pos" << str.device()->pos(); Q_ASSERT((*it2).service()->offset() != 0); str << qint32(offset); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.69.0/src/sycoca/ksycocaentry.h new/kservice-5.70.0/src/sycoca/ksycocaentry.h --- old/kservice-5.69.0/src/sycoca/ksycocaentry.h 2020-04-05 01:04:00.000000000 +0200 +++ new/kservice-5.70.0/src/sycoca/ksycocaentry.h 2020-05-03 00:22:35.000000000 +0200 @@ -58,7 +58,13 @@ */ KSycocaType sycocaType() const; + /** + * A shared data pointer for KSycocaEntry. + */ typedef QExplicitlySharedDataPointer<KSycocaEntry> Ptr; + /** + * A list of shared data pointers for KSycocaEntry. + */ typedef QList<Ptr> List; /**
