diff options
Diffstat (limited to 'kde-frameworks/kcmutils')
-rw-r--r-- | kde-frameworks/kcmutils/Manifest | 3 | ||||
-rw-r--r-- | kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch | 52 | ||||
-rw-r--r-- | kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild (renamed from kde-frameworks/kcmutils/kcmutils-5.92.0.ebuild) | 2 |
3 files changed, 56 insertions, 1 deletions
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest index 2e51f1b57eda..4f805619b1ac 100644 --- a/kde-frameworks/kcmutils/Manifest +++ b/kde-frameworks/kcmutils/Manifest @@ -1,5 +1,6 @@ +AUX kcmutils-5.92.0-KDEBUG-444378.patch 2490 BLAKE2B 5287389c76d78ef404d7ba5b3766a0160175be996b36bb2014cf01c28098167c057aa9ee097eb38e918c9d270c354c84dc015a0044f3badf2b87c46904c47c8d SHA512 4a7d19f8c214c914cf25119c32afbdca1939a9832a5f9eaee287084afb3aaa248ade9cae8c10bdcbdc6d4ac79a794a6c2e253c658c3f2fccf973d960b603085e DIST kcmutils-5.90.0.tar.xz 172012 BLAKE2B 43ff36420c47673f786f39397c2feae2f6a42028d3fa5a3369316c5d38973fe48ce8cb9cb5f5b9e3c791561aa18fcb7596fd7e55a1a133e4e26f19c3c4368465 SHA512 e6c3257c169d79a98a86586594db796e5c63585dc63989b264a4a8d852ed42bc301b2fd0f6f6421cfc5eb1244e4afcc86a9cd88a5e8c36cdd5bbd7359587c9e4 DIST kcmutils-5.92.0.tar.xz 172120 BLAKE2B 221482f15f1c8138f60565215f5c0c2d6e9922d82d81d3a90a1685f9e7a9407e459d56dd5e91a8dfc5b6dc322ec012a15422d265ca0cfaff54a8b7effb1ba0aa SHA512 b0810f87fc7b641ff05ae8b9816434175e494786ee86201a34bd435c2177e6b8dd963e60804747cec954ca7f02d54bdc7f944b72c0a774ff4dd86b186e9e2f8f EBUILD kcmutils-5.90.0.ebuild 949 BLAKE2B 91aff77a48c680e7d5d8ca01462a6f29b1e361bff3d9a3476ac8a4d1be823c293200242d6a802d0e6e3c8d5e9f0cf60bb26760cf84a00858abe209132eac2011 SHA512 67a553cf0e8e1cf0794482cb1da9c0449619c59b44e42f658be7705792f5486b8c0d0d6b4eb9c17656966c95c11bbcd39b23d933b22403ee28144f050fae4bd4 -EBUILD kcmutils-5.92.0.ebuild 952 BLAKE2B a6fa028c861468dc45255908206a960ec1f3c7f560962653884ffe711d3eac8b25cde0fecafee47cded3cc07cb97cb06bab6173b505269b85317a35d35225458 SHA512 01dac88e77f2e61a33bf1402053004a479acc7fb3f68abe44bb571d7bac180dcc1b7fc832797e421f00b7c513e6266b541f9eba46c9532b213d3af5c6b1a2331 +EBUILD kcmutils-5.92.0-r1.ebuild 1004 BLAKE2B a3d6257ad4b5eb93bbfc07fd14147af4b46c0ee3716779e028b6513f28185c24d052acb99dd5da210658afcd8112b7912a9bd79639abcb48c238cba6bbb3032c SHA512 f8b2611361d534a93b3c9a88f2e9f286862405e9024ac110dec3c3d8d921d24140ba986532dbc3756590f2c645b3e442be1f860477f300f243b303ddba3e9ec6 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch b/kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch new file mode 100644 index 000000000000..b0f5b947dfcd --- /dev/null +++ b/kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch @@ -0,0 +1,52 @@ +From c9c58de65c07c8a940cb4c9b91777450698f635c Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau <alexander.lohnau@gmx.de> +Date: Sun, 6 Mar 2022 21:31:51 +0100 +Subject: [PATCH] Fix KPluginSelector KCMs missing their metadata on plugin + loading + +For the KWin KCMs we need the full metadata, because we read the +plugin keyword. + +Without the X-KDE-ConfigModule key, plugins used to create a symlink +in the kservices5 folder to their metadata, which then goes through the +legacy code path we would read all the metadata. +This includes the plugin keyword. + +When consumers would this key, but have an old KWin version which +used the KPluginSelector class and a kcmutils version which reads X-KDE-ConfigModule, but does not +include this bugfix, the plugin keyword will be empty and thus the config +files can not be located. + +This makes it hard to fix the loading on kcmutils < 5.91, but keeping the +code working with KWin < 5.24. + +To test this, you should check out KWin 5.23 and kcmutils master. +Fox example https://github.com/nclarius/tile-gaps/ will then fail +to load it's config. With this change included, it should load properly. + +BUG: 444378 +--- + src/kpluginselector.cpp | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index d5248d3..1f4c651 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -969,10 +969,9 @@ void KPluginSelector::Private::PluginDelegate::configure(const QModelIndex &inde + const QString pluginId = configModule.mid(idx + 1); + metaDataList = {KPluginMetaData::findPluginById(pluginNamespace, pluginId)}; // Clear the list to avoid old desktop files to appear twice + } else { +- // the KCMs don't need any metadata themselves, just set the name to make sure the KPluginMetaData object +- // is valid & the internal usage has the data it needs +- QJsonObject kplugin({{QLatin1String("Name"), pluginInfo.name()}}); +- KPluginMetaData data(QJsonObject{{QLatin1String("KPlugin"), kplugin}}, absoluteKCMPath); ++ // the KCMs don't need any metadata themselves, just use the one from the KPluginInfo object ++ // this way for example a KPackage plugin can specify plugin keyword ++ KPluginMetaData data(pluginInfo.toMetaData().rawData(), absoluteKCMPath); + metaDataList = {data}; // Clear the list to avoid old desktop files to appear twice + } + } +-- +GitLab + diff --git a/kde-frameworks/kcmutils/kcmutils-5.92.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild index 108498b3c21d..8db8c72c2fc9 100644 --- a/kde-frameworks/kcmutils/kcmutils-5.92.0.ebuild +++ b/kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild @@ -32,3 +32,5 @@ DEPEND=" =kde-frameworks/kxmlgui-${PVCUT}*:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-KDEBUG-444378.patch" ) |