Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2023-03-12 16:23:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Sun Mar 12 16:23:29 2023 rev:102 rq:1070906 version:5.104.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2023-02-13 16:40:42.935271682 +0100 +++ /work/SRC/openSUSE:Factory/.kpackage.new.31432/kpackage.changes 2023-03-12 16:25:23.181066100 +0100 @@ -1,0 +2,10 @@ +Mon Mar 6 09:07:59 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 5.104.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.104.0 +- Changes since 5.103.0: + * Check pluginId contains '/' before using it as package type (kde#449727) + +------------------------------------------------------------------- Old: ---- kpackage-5.103.0.tar.xz kpackage-5.103.0.tar.xz.sig New: ---- kpackage-5.104.0.tar.xz kpackage-5.104.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.p4J8nh/_old 2023-03-12 16:25:23.649068161 +0100 +++ /var/tmp/diff_new_pack.p4J8nh/_new 2023-03-12 16:25:23.653068178 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.103 +%define _tar_path 5.104 # 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: kpackage -Version: 5.103.0 +Version: 5.104.0 Release: 0 Summary: Non-binary asset user-installable package managing framework License: GPL-2.0-or-later AND LGPL-2.0-or-later ++++++ kpackage-5.103.0.tar.xz -> kpackage-5.104.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/CMakeLists.txt new/kpackage-5.104.0/CMakeLists.txt --- old/kpackage-5.103.0/CMakeLists.txt 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/CMakeLists.txt 2023-03-04 11:06:37.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.103.0") # handled by release scripts -set(KF_DEP_VERSION "5.103.0") # handled by release scripts +set(KF_VERSION "5.104.0") # handled by release scripts +set(KF_DEP_VERSION "5.104.0") # handled by release scripts project(KPackage VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.103.0 NO_MODULE) +find_package(ECM 5.104.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/kpackage-5.103.0/autotests/data/testplasmathemepackagewithoutservicetypes/metadata.desktop new/kpackage-5.104.0/autotests/data/testplasmathemepackagewithoutservicetypes/metadata.desktop --- old/kpackage-5.103.0/autotests/data/testplasmathemepackagewithoutservicetypes/metadata.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kpackage-5.104.0/autotests/data/testplasmathemepackagewithoutservicetypes/metadata.desktop 2023-03-04 11:06:37.000000000 +0100 @@ -0,0 +1,18 @@ +[Desktop Entry] +Name=Greybird-Dark + +X-KDE-PluginInfo-Author=Alexey Varfolomeev [email protected] +X-KDE-PluginInfo-Name=Greybird-Dark +X-KDE-PluginInfo-Version=20220914 +X-KDE-PluginInfo-Website=https://github.com/varlesh/greybird-kde +X-KDE-PluginInfo-Category= +X-KDE-PluginInfo-Depends= +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=true + +[ContrastEffect] +enabled=false +contrast=0.2 +intensity=0.4 +saturation=1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/autotests/querytest.cpp new/kpackage-5.104.0/autotests/querytest.cpp --- old/kpackage-5.103.0/autotests/querytest.cpp 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/autotests/querytest.cpp 2023-03-04 11:06:37.000000000 +0100 @@ -103,4 +103,16 @@ QCOMPARE(KPackage::PackageLoader::self()->listPackages(QStringLiteral("Plasma/TestKPackageInternalPlasmoid")).count(), 4); } +void QueryTest::noServiceTypesPackage() +{ +#if QT_VERSION_MAJOR >= 6 + QSKIP("desktop metadata files are not supported in Qt6"); +#endif + const int oldSize = KPackage::PackageLoader::self()->listPackages(QStringLiteral("KPackage/Generic")).size(); + + QVERIFY(checkedInstall(ps, QFINDTESTDATA("data/testplasmathemepackagewithoutservicetypes"), KJob::NoError)); + + QCOMPARE(KPackage::PackageLoader::self()->listPackages(QStringLiteral("KPackage/Generic")).size(), oldSize + 1); +} + QTEST_MAIN(QueryTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/autotests/querytest.h new/kpackage-5.104.0/autotests/querytest.h --- old/kpackage-5.103.0/autotests/querytest.h 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/autotests/querytest.h 2023-03-04 11:06:37.000000000 +0100 @@ -21,6 +21,8 @@ void installAndQuery(); void queryCustomPlugin(); + // Tests a package without ServiceTypes can be listed + void noServiceTypesPackage(); private: KPackage::Package ps; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/po/fr/libkpackage5.po new/kpackage-5.104.0/po/fr/libkpackage5.po --- old/kpackage-5.103.0/po/fr/libkpackage5.po 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/po/fr/libkpackage5.po 2023-03-04 11:06:37.000000000 +0100 @@ -26,7 +26,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 22.12.0\n" +"X-Generator: Lokalize 22.12.3\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/po/it/libkpackage5.po new/kpackage-5.104.0/po/it/libkpackage5.po --- old/kpackage-5.103.0/po/it/libkpackage5.po 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/po/it/libkpackage5.po 2023-03-04 11:06:37.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Federico Zenith <[email protected]>, 2008, 2009, 2010, 2011, 2012. -# Vincenzo Reale <[email protected]>, 2014, 2015, 2017, 2018, 2020, 2022. +# Vincenzo Reale <[email protected]>, 2014, 2015, 2017, 2018, 2020, 2022, 2023. # msgid "" msgstr "" @@ -17,7 +17,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 22.04.3\n" +"X-Generator: Lokalize 22.12.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/po/pt_BR/docs/kpackagetool/man-kpackagetool5.1.docbook new/kpackage-5.104.0/po/pt_BR/docs/kpackagetool/man-kpackagetool5.1.docbook --- old/kpackage-5.103.0/po/pt_BR/docs/kpackagetool/man-kpackagetool5.1.docbook 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/po/pt_BR/docs/kpackagetool/man-kpackagetool5.1.docbook 2023-03-04 11:06:37.000000000 +0100 @@ -30,7 +30,7 @@ >kpackagetool5</command ></refname> <refpurpose ->Instalar, listar e remover os pacotes do Plasma</refpurpose> +>Instalar, listar e remover os pacotes do &plasma;</refpurpose> </refnamediv> <refsynopsisdiv> @@ -112,7 +112,7 @@ <para ><command >kpackagetool5</command -> é uma ferramenta de linha de comando para instalar, listar e remover pacotes Plasma.</para> +> é uma ferramenta de linha de comando para instalar, listar e remover pacotes &plasma;.</para> </refsect1> @@ -174,7 +174,7 @@ ></term> <listitem ><para ->O tipo de pacote, correspondendo ao tipo de serviço do plugin de pacotes, ⪚ KPackage/Genérico, Plasma/Tema, Plasma/Papel de parede, Plasma/Miniaplicativo, etc.</para +>O tipo de pacote, correspondendo ao tipo de serviço do plugin de pacotes, ⪚ KPackage/Genérico, Plasma/Tema, Plasma/Papel de parede, Plasma/Miniaplicativo, &etc;.</para ></listitem> </varlistentry> <varlistentry> @@ -295,9 +295,7 @@ <para >Documentação do usuário mais detalhada está disponÃvel em <ulink >url="help:/plasma-desktop" >help:/plasma-desktop</ulink -> (quer através deste <acronym ->URL</acronym -> no &konqueror;, quer através do comando <userinput +> (quer através deste &URL; no &konqueror;, quer através do comando <userinput ><command >khelpcenter</command > <parameter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/po/zh_CN/libkpackage5.po new/kpackage-5.104.0/po/zh_CN/libkpackage5.po --- old/kpackage-5.103.0/po/zh_CN/libkpackage5.po 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/po/zh_CN/libkpackage5.po 2023-03-04 11:06:37.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-15 00:41+0000\n" -"PO-Revision-Date: 2023-01-12 10:30\n" +"PO-Revision-Date: 2023-02-24 12:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.103.0/src/kpackage/private/utils.h new/kpackage-5.104.0/src/kpackage/private/utils.h --- old/kpackage-5.103.0/src/kpackage/private/utils.h 2023-02-05 10:24:51.000000000 +0100 +++ new/kpackage-5.104.0/src/kpackage/private/utils.h 2023-03-04 11:06:37.000000000 +0100 @@ -25,9 +25,10 @@ types << serviceTypes; } // while most package structure plugins do, they don't need to set the service types, - // if we haven't found anything so far we use the plugin id - if (types.isEmpty() && !metaData.fileName().endsWith(QLatin1String(".json"))) { - types << metaData.pluginId(); + // if we haven't found anything so far we use the plugin id if it looks like a valid package type. + const QString pluginId = metaData.pluginId(); + if (types.isEmpty() && !metaData.fileName().endsWith(QLatin1String(".json")) && pluginId.contains(QLatin1Char('/'))) { + types << pluginId; } return types; }
