Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2022-03-14 19:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Mon Mar 14 19:34:44 2022 rev:105 rq:961273 version:5.92.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2022-02-24 18:22:08.854679233 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new.25692/kservice.changes 2022-03-14 19:36:16.242069143 +0100 @@ -1,0 +2,13 @@ +Mon Mar 7 09:27:13 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.92.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.92.0 +- Changes since 5.91.0: + * Use :/kservicetypes5 instead of :/kf/kservicetypes5 + * Add Qt6 Android CI + * Explicitely call KPluginMetaData::fromDesktopFile instead of + KPluginMetaData(QString fileName) constructor + +------------------------------------------------------------------- Old: ---- kservice-5.91.0.tar.xz kservice-5.91.0.tar.xz.sig New: ---- kservice-5.92.0.tar.xz kservice-5.92.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.vv1woe/_old 2022-03-14 19:36:16.710069704 +0100 +++ /var/tmp/diff_new_pack.vv1woe/_new 2022-03-14 19:36:16.718069714 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.91 +%define _tar_path 5.92 # 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 released Name: kservice -Version: 5.91.0 +Version: 5.92.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later @@ -45,7 +45,6 @@ BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5Crash) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5DBusAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5DocTools) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5I18n) >= %{_kf5_bugfix_version} ++++++ kservice-5.91.0.tar.xz -> kservice-5.92.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.91.0/.gitlab-ci.yml new/kservice-5.92.0/.gitlab-ci.yml --- old/kservice-5.91.0/.gitlab-ci.yml 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/.gitlab-ci.yml 2022-03-05 14:06:03.000000000 +0100 @@ -6,3 +6,4 @@ - 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 - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.91.0/CMakeLists.txt new/kservice-5.92.0/CMakeLists.txt --- old/kservice-5.91.0/CMakeLists.txt 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/CMakeLists.txt 2022-03-05 14:06:03.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.91.0") # handled by release scripts -set(KF_DEP_VERSION "5.91.0") # handled by release scripts +set(KF_VERSION "5.92.0") # handled by release scripts +set(KF_DEP_VERSION "5.92.0") # handled by release scripts project(KService VERSION ${KF_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.91.0 NO_MODULE) +find_package(ECM 5.92.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.91.0/autotests/kservicetest.cpp new/kservice-5.92.0/autotests/kservicetest.cpp --- old/kservice-5.91.0/autotests/kservicetest.cpp 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/autotests/kservicetest.cpp 2022-03-05 14:06:03.000000000 +0100 @@ -913,7 +913,8 @@ #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void KServiceTest::testKPluginInfoQuery() { - KPluginInfo info(KPluginMetaData(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String{"/kservices5/fakepart2.desktop"})); + KPluginInfo info(KPluginMetaData::fromDesktopFile(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + + QLatin1String{"/kservices5/fakepart2.desktop"})); QCOMPARE(info.property(QStringLiteral("X-KDE-TestList")).toStringList().size(), 2); } @@ -938,7 +939,7 @@ void KServiceTest::testKPluginMetaData() { const QString fakePart = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String{"/kservices5/fakepart.desktop"}; - KPluginMetaData md(fakePart); + KPluginMetaData md = KPluginMetaData::fromDesktopFile(fakePart); KService::Ptr service(new KService(fakePart)); KPluginInfo info(service); auto info_md = info.toMetaData(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.91.0/po/sk/kservice5.po new/kservice-5.92.0/po/sk/kservice5.po --- old/kservice-5.91.0/po/sk/kservice5.po 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/po/sk/kservice5.po 2022-03-05 14:06:03.000000000 +0100 @@ -7,20 +7,20 @@ # Michal Sulek <[email protected]>, 2009, 2010, 2011. # Richard Fri?? <[email protected]>, 2011. # Roman Pahol??k <[email protected]>, 2012, 2013, 2014, 2015. -# Matej Mrenica <[email protected]>, 2019. +# Matej Mrenica <[email protected]>, 2019, 2022. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-22 00:40+0000\n" -"PO-Revision-Date: 2019-11-18 13:09+0100\n" +"PO-Revision-Date: 2022-02-14 19:54+0100\n" "Last-Translator: Matej Mrenica <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 19.11.80\n" +"X-Generator: Lokalize 21.12.2\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #, kde-format @@ -180,7 +180,7 @@ #: kdeinit/ktoolinvocation_x11.cpp:342 #, kde-format msgid "Unable to determine the default terminal" -msgstr "" +msgstr "Nie je mo??n?? ur??i?? predvolen?? termin??l" #: kdeinit/ktoolinvocation_x11.cpp:354 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.91.0/po/zh_CN/kservice5.po new/kservice-5.92.0/po/zh_CN/kservice5.po --- old/kservice-5.91.0/po/zh_CN/kservice5.po 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/po/zh_CN/kservice5.po 2022-03-05 14:06:03.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-22 00:40+0000\n" -"PO-Revision-Date: 2022-01-08 15:23\n" +"PO-Revision-Date: 2022-02-26 05:17\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.91.0/src/kservice.qrc new/kservice-5.92.0/src/kservice.qrc --- old/kservice-5.91.0/src/kservice.qrc 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/src/kservice.qrc 2022-03-05 14:06:03.000000000 +0100 @@ -1,6 +1,6 @@ <!DOCTYPE RCC> <RCC version="1.0"> - <qresource prefix="/kf/kservicetypes5/"> + <qresource prefix="/kservicetypes5/"> <file alias="application.desktop">services/application.desktop</file> </qresource> </RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.91.0/src/services/kplugininfo.cpp new/kservice-5.92.0/src/services/kplugininfo.cpp --- old/kservice-5.91.0/src/services/kplugininfo.cpp 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/src/services/kplugininfo.cpp 2022-03-05 14:06:03.000000000 +0100 @@ -280,7 +280,11 @@ return; } - d->setMetaData(KPluginMetaData(file.fileName()), true); + if (file.fileName().endsWith(QLatin1String(".desktop"))) { + d->setMetaData(KPluginMetaData::fromDesktopFile(file.fileName()), true); + } else { + d->setMetaData(KPluginMetaData(file.fileName()), true); + } if (!d->metaData.isValid()) { qCWarning(SERVICES) << "Failed to read metadata from .desktop file" << file.fileName(); d.reset(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.91.0/src/sycoca/kbuildservicetypefactory.cpp new/kservice-5.92.0/src/sycoca/kbuildservicetypefactory.cpp --- old/kservice-5.91.0/src/sycoca/kbuildservicetypefactory.cpp 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/src/sycoca/kbuildservicetypefactory.cpp 2022-03-05 14:06:03.000000000 +0100 @@ -50,7 +50,7 @@ } QString filePath = QLatin1String("kservicetypes5/") + file; - const QString qrcFilePath = QLatin1String(":/kf/") + filePath; + const QString qrcFilePath = QLatin1String(":/") + filePath; if (QFileInfo::exists(qrcFilePath)) { filePath = qrcFilePath; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.91.0/src/sycoca/kbuildsycoca.cpp new/kservice-5.92.0/src/sycoca/kbuildsycoca.cpp --- old/kservice-5.91.0/src/sycoca/kbuildsycoca.cpp 2022-02-05 22:28:54.000000000 +0100 +++ new/kservice-5.92.0/src/sycoca/kbuildsycoca.cpp 2022-03-05 14:06:03.000000000 +0100 @@ -129,7 +129,7 @@ static QStringList locateDirInResource(const QString &resourceSubdir) { - const QString dir = QStringLiteral(":/kf/") + resourceSubdir; + const QString dir = QStringLiteral(":/") + resourceSubdir; // e.g. :/kservicetypes5 if (QDir(dir).exists()) { return {dir}; } @@ -619,7 +619,7 @@ return updateHash(filename, hash); } const QString filePath = resourceSubDir + QLatin1Char('/') + filename; - const QString qrcFilePath = QStringLiteral(":/kf/") + filePath; + const QString qrcFilePath = QStringLiteral(":/") + filePath; const QStringList files = QFileInfo::exists(qrcFilePath) ? QStringList{qrcFilePath} : QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, filePath); for (const QString &file : files) {
