diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
| commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
| tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /kde-frameworks/kcmutils | |
| parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) | |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'kde-frameworks/kcmutils')
| -rw-r--r-- | kde-frameworks/kcmutils/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch | 31 | ||||
| -rw-r--r-- | kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild (renamed from kde-frameworks/kcmutils/kcmutils-5.67.0.ebuild) | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest index c3792f87ab65..a2fd7434b001 100644 --- a/kde-frameworks/kcmutils/Manifest +++ b/kde-frameworks/kcmutils/Manifest @@ -1,5 +1,6 @@ +AUX kcmutils-5.67.0-check-activeModule.patch 990 BLAKE2B 58db0339813632292d9e58abd6803e9d1b6cf3745aa65d66f3b9155e8db4fcaf36dd010e4bec610a0f71e077064c9dc301d705ee57f1509464d1d91e4a86ade9 SHA512 a9fdefd87ab0061f73b0ee1af26a5080bc98998faf5982a5bc957e8719f2872c248b737187cfbfa05983a55540dd88a6b92c31acf832c2d554256fc10c1a40fe DIST kcmutils-5.64.0.tar.xz 240248 BLAKE2B 3d7a7817c0e7eafc5cb9213f0571f1e343d79328455f40ffb245e36ba6d360e81b2b5d9179c0179396753ca07b49c9167704a078b517804007f0f7fb19a2d8f4 SHA512 c57df3500a2816a13e5e1e84e4ca4f62c429c013105a843c1b9ee3c6540d1a2a37f78174d1e36266f7ab027ce3073c238bf8441e001d00470fd829632839a05b DIST kcmutils-5.67.0.tar.xz 239872 BLAKE2B 53ca73c4dd63acabeccae7b5bcda077f179f5f8d6acee751035285e21c2e1c100e2c222da88ee1c774c602e2671d3abf65fc06e28ee2f9446378de7f811c70e8 SHA512 f25605b5400fc8bdd9a7153ea368a41d254a08c3abf6cae9e0454d9406af4418b622519d72a41ebc5342a88fedc0ae128198036e97ba49b1ab10de5f2e6f919c EBUILD kcmutils-5.64.0.ebuild 903 BLAKE2B 225ded45cc13f7fa8fab2cf0e03a284aaa7f21c2467e39585797ac395ade5f9c7a5dd0de9e2c43d4f7114fea2604fe4d21ed2033d2f434f5e2876494ecdf9e85 SHA512 5c2149f9a360facb8517c52f170280c1d70b8ec3df67addae79d4666e751b56d9e4559dd144f8c9b138366da518f221a8f0aa878b59384d200d71b050d0018bc -EBUILD kcmutils-5.67.0.ebuild 912 BLAKE2B 2ca2e8caf652f65466ccddb153e27fe27ca0832fe784e4bfd324962f6c56de6172891277e4c1839b33ee116ce195e629863bc5b42e2ec6a526da03171bb7cf86 SHA512 b4a997080808d663f540bf582e518793d10c132820014dfe45d44cc0411d25a8b8f9992a0d83fcbb04d1ffe3a09059736dc9f2171db3635bce71167721e403b6 +EBUILD kcmutils-5.67.0-r1.ebuild 991 BLAKE2B 1fdd1e309ffa10842113266edab8fc66c2ea4b57e1e60afc5a08870fe578752ae3af4f496ff9bf8ef25cc51839820d0397bd758868b0dd5a04e0a56234193098 SHA512 2d4dded7687a407271a40f596491578181c38690b9891bfa59419027c917a054f5acab179698b8502cdfcfffb5e1e5309ff8cfd5e4abf8e35fe30ac1a9314c91 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 new file mode 100644 index 000000000000..63b4b5189fab --- /dev/null +++ b/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch @@ -0,0 +1,31 @@ +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.ebuild b/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild index ca24c4c0bdbe..302bf05629a9 100644 --- a/kde-frameworks/kcmutils/kcmutils-5.67.0.ebuild +++ b/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild @@ -31,3 +31,5 @@ DEPEND=" >=dev-qt/qtwidgets-${QTMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-check-activeModule.patch" ) # bug 710078, in 5.68 |