diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /kde-frameworks/kcmutils | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'kde-frameworks/kcmutils')
4 files changed, 2 insertions, 71 deletions
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest index c6e0b353c6bb..56b48db25090 100644 --- a/kde-frameworks/kcmutils/Manifest +++ b/kde-frameworks/kcmutils/Manifest @@ -1,6 +1,3 @@ -AUX kcmutils-5.67.0-check-activeModule.patch 990 BLAKE2B 58db0339813632292d9e58abd6803e9d1b6cf3745aa65d66f3b9155e8db4fcaf36dd010e4bec610a0f71e077064c9dc301d705ee57f1509464d1d91e4a86ade9 SHA512 a9fdefd87ab0061f73b0ee1af26a5080bc98998faf5982a5bc957e8719f2872c248b737187cfbfa05983a55540dd88a6b92c31acf832c2d554256fc10c1a40fe -DIST kcmutils-5.67.0.tar.xz 239872 BLAKE2B 53ca73c4dd63acabeccae7b5bcda077f179f5f8d6acee751035285e21c2e1c100e2c222da88ee1c774c602e2671d3abf65fc06e28ee2f9446378de7f811c70e8 SHA512 f25605b5400fc8bdd9a7153ea368a41d254a08c3abf6cae9e0454d9406af4418b622519d72a41ebc5342a88fedc0ae128198036e97ba49b1ab10de5f2e6f919c DIST kcmutils-5.70.0.tar.xz 239804 BLAKE2B dd137525dcfe057631891b934077f520dd7d9379f3657e36b3ecd5402b969eb7fc77c6360df7547c9ad32f412154faaf039662ff7ccec94ec2c85ecc1b21674f SHA512 2b1811c30bc003b2f4325aa1ce094cb9cffcb96eead58a55d4c40cd100ef3cc640d38510077ddc306bfd526526fb0598c3efa49f8342a0ffa46c296bac240c38 -EBUILD kcmutils-5.67.0-r1.ebuild 988 BLAKE2B 283fd0b6a10d8b3aaa91c789694abcf669ff1deb676fc5266f7cb82f71335c80d2f2c1d22baf27b493564993e01c4f4ca927fbf2140ac45f47db748677c8839c SHA512 268fb740bf1bab4dd676643a66d146e0c717858972e4ae2c8d5c0af7f1c0d9496b26b394cce41ddfe4ecadb56c2a9c804f99a9c695393d52f39d12e8628777de -EBUILD kcmutils-5.70.0.ebuild 912 BLAKE2B 2ca2e8caf652f65466ccddb153e27fe27ca0832fe784e4bfd324962f6c56de6172891277e4c1839b33ee116ce195e629863bc5b42e2ec6a526da03171bb7cf86 SHA512 b4a997080808d663f540bf582e518793d10c132820014dfe45d44cc0411d25a8b8f9992a0d83fcbb04d1ffe3a09059736dc9f2171db3635bce71167721e403b6 +EBUILD kcmutils-5.70.0.ebuild 909 BLAKE2B ffc07cf13f4af27ed26da62a67d75cfe1d7bf2d7867d8ba7f9f6dad47e8c238e0267814f388617e5699df338ca4de2b9425e4c78cd91a73fbffb68a475db706f SHA512 e9270139090b7f5fca513ea580d29b9c0bee76d34607aa6a56626e399183251e120b758f9f9d4ff4a77c0443c2fb3c180edfe1b52785158c31c7b8c60bff7260 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch b/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch deleted file mode 100644 index 63b4b5189fab..000000000000 --- a/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ea7120ed901bf6161bb483ab73211a6491daac8f Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer <wbauer@tmo.at> -Date: Sun, 16 Feb 2020 18:05:06 +0100 -Subject: Check activeModule before using it - -`activeModule` can be a nullptr here, as this is outside/after the -`if (activeModule)`. -This causes kontact to crash when opening its settings. - -BUG: 417396 -FIXED-IN: 5.68.0 -Differential Revision: https://phabricator.kde.org/D27433 ---- - src/kcmultidialog.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kcmultidialog.cpp b/src/kcmultidialog.cpp -index 90da1c0..6a36ba5 100644 ---- a/src/kcmultidialog.cpp -+++ b/src/kcmultidialog.cpp -@@ -181,7 +181,7 @@ void KCMultiDialogPrivate::_k_clientChanged() - #endif - } - -- auto buttons = activeModule->buttons(); -+ auto buttons = activeModule ? activeModule->buttons() : KCModule::NoAdditionalButton; - - QPushButton *resetButton = q->buttonBox()->button(QDialogButtonBox::Reset); - if (resetButton) { --- -cgit v1.1 diff --git a/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild b/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild deleted file mode 100644 index a38571f8ebf7..000000000000 --- a/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Framework to work with KDE System Settings modules" -LICENSE="LGPL-2" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - =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 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-check-activeModule.patch" ) # bug 710078, in 5.68 diff --git a/kde-frameworks/kcmutils/kcmutils-5.70.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.70.0.ebuild index ca24c4c0bdbe..39682e97ceb0 100644 --- a/kde-frameworks/kcmutils/kcmutils-5.70.0.ebuild +++ b/kde-frameworks/kcmutils/kcmutils-5.70.0.ebuild @@ -10,7 +10,7 @@ inherit ecm kde.org DESCRIPTION="Framework to work with KDE System Settings modules" LICENSE="LGPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="" DEPEND=" |