diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 14:10:02 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 14:10:02 +0100 |
commit | 7e17b5aabc330abb894f2b90bef0e3fcbcd180d2 (patch) | |
tree | 0b0cd08ce6e24faf7c868b07127ee0b6b32153c7 /kde-frameworks/kcmutils | |
parent | da3552023d9aae2ee5183df71a80a8169414974e (diff) |
gentoo auto-resync : 06:08:2022 - 14:10:01
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 | 36 |
3 files changed, 0 insertions, 91 deletions
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest index 92790c3290a1..9a8f390ceab0 100644 --- a/kde-frameworks/kcmutils/Manifest +++ b/kde-frameworks/kcmutils/Manifest @@ -1,6 +1,3 @@ -AUX kcmutils-5.92.0-KDEBUG-444378.patch 2490 BLAKE2B 5287389c76d78ef404d7ba5b3766a0160175be996b36bb2014cf01c28098167c057aa9ee097eb38e918c9d270c354c84dc015a0044f3badf2b87c46904c47c8d SHA512 4a7d19f8c214c914cf25119c32afbdca1939a9832a5f9eaee287084afb3aaa248ade9cae8c10bdcbdc6d4ac79a794a6c2e253c658c3f2fccf973d960b603085e -DIST kcmutils-5.92.0.tar.xz 172120 BLAKE2B 221482f15f1c8138f60565215f5c0c2d6e9922d82d81d3a90a1685f9e7a9407e459d56dd5e91a8dfc5b6dc322ec012a15422d265ca0cfaff54a8b7effb1ba0aa SHA512 b0810f87fc7b641ff05ae8b9816434175e494786ee86201a34bd435c2177e6b8dd963e60804747cec954ca7f02d54bdc7f944b72c0a774ff4dd86b186e9e2f8f DIST kcmutils-5.96.0.tar.xz 186272 BLAKE2B 6c0996883d36431aa3bed2b6c83a8efef8791fd3d347d773e94a75c390c060ba3d0ef92eef8dac8902c9a734b9a348fcf0c8d912f8d15a316e2fa282921ace23 SHA512 75470dfbd9191f4ccdf8cea9078486c708135ff41407f6a9cc3c4d2b045501b36b3e874761f322e82eb052f806e3bf8ff1263860a36e7678e46a580c2413b0b3 -EBUILD kcmutils-5.92.0-r1.ebuild 1001 BLAKE2B 44d9f078cdaeb031ee73480439a30dde531e461de2c7bf45fb3120ca4d915f3a2561f67eeeec9231b2486c23dd01a6a98779ef07dc7f992cc59df4ae665e6c84 SHA512 72a16f791dd1070a880f2115de850aface180e85b5a857c0497ea6a3c5e7853cfef2240ac361e3db2bd4d7a864681d785d8cdda71b327c068b2ba9a5e2a34031 EBUILD kcmutils-5.96.0.ebuild 967 BLAKE2B 3f657cc7baa15074f048a477cdc988dc6e74608ed6456d8451385f1a4a5f80de8d2034e87afb5d9dea6df8ca1bb1c6d9b7017facada2bdf24550d5d49215a71d SHA512 dd9e8e2998153e5bdcebef631d5b0546716ef8cb855e3ade7d202dbd078d31c657f326453a8f94d345803e4eaed1a2ff1df2b5689118d4a3ad71237663e78884 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 deleted file mode 100644 index b0f5b947dfcd..000000000000 --- a/kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch +++ /dev/null @@ -1,52 +0,0 @@ -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-r1.ebuild b/kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild deleted file mode 100644 index 3b06f270a6d2..000000000000 --- a/kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Framework to work with KDE System Settings modules" -LICENSE="LGPL-2" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kdeclarative-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-KDEBUG-444378.patch" ) |