1 |
commit: cfcc5d1dbf53bb25845c49a602ddf6ff4247c8a9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 19 10:13:31 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 19 10:46:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfcc5d1d |
7 |
|
8 |
kde-frameworks/kcmutils: Check activeModule before using it |
9 |
|
10 |
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417396 |
11 |
Reported-by: Theofilos Intzoglou <int.teo <AT> gmail.com> |
12 |
Closes: https://bugs.gentoo.org/710078 |
13 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
.../files/kcmutils-5.67.0-check-activeModule.patch | 31 +++++++++++++++++++ |
17 |
kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild | 35 ++++++++++++++++++++++ |
18 |
2 files changed, 66 insertions(+) |
19 |
|
20 |
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 |
21 |
new file mode 100644 |
22 |
index 00000000000..63b4b5189fa |
23 |
--- /dev/null |
24 |
+++ b/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch |
25 |
@@ -0,0 +1,31 @@ |
26 |
+From ea7120ed901bf6161bb483ab73211a6491daac8f Mon Sep 17 00:00:00 2001 |
27 |
+From: Wolfgang Bauer <wbauer@×××.at> |
28 |
+Date: Sun, 16 Feb 2020 18:05:06 +0100 |
29 |
+Subject: Check activeModule before using it |
30 |
+ |
31 |
+`activeModule` can be a nullptr here, as this is outside/after the |
32 |
+`if (activeModule)`. |
33 |
+This causes kontact to crash when opening its settings. |
34 |
+ |
35 |
+BUG: 417396 |
36 |
+FIXED-IN: 5.68.0 |
37 |
+Differential Revision: https://phabricator.kde.org/D27433 |
38 |
+--- |
39 |
+ src/kcmultidialog.cpp | 2 +- |
40 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
41 |
+ |
42 |
+diff --git a/src/kcmultidialog.cpp b/src/kcmultidialog.cpp |
43 |
+index 90da1c0..6a36ba5 100644 |
44 |
+--- a/src/kcmultidialog.cpp |
45 |
++++ b/src/kcmultidialog.cpp |
46 |
+@@ -181,7 +181,7 @@ void KCMultiDialogPrivate::_k_clientChanged() |
47 |
+ #endif |
48 |
+ } |
49 |
+ |
50 |
+- auto buttons = activeModule->buttons(); |
51 |
++ auto buttons = activeModule ? activeModule->buttons() : KCModule::NoAdditionalButton; |
52 |
+ |
53 |
+ QPushButton *resetButton = q->buttonBox()->button(QDialogButtonBox::Reset); |
54 |
+ if (resetButton) { |
55 |
+-- |
56 |
+cgit v1.1 |
57 |
|
58 |
diff --git a/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild b/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild |
59 |
new file mode 100644 |
60 |
index 00000000000..302bf05629a |
61 |
--- /dev/null |
62 |
+++ b/kde-frameworks/kcmutils/kcmutils-5.67.0-r1.ebuild |
63 |
@@ -0,0 +1,35 @@ |
64 |
+# Copyright 1999-2020 Gentoo Authors |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+ |
67 |
+EAPI=7 |
68 |
+ |
69 |
+ECM_TEST="false" |
70 |
+PVCUT=$(ver_cut 1-2) |
71 |
+QTMIN=5.12.3 |
72 |
+inherit ecm kde.org |
73 |
+ |
74 |
+DESCRIPTION="Framework to work with KDE System Settings modules" |
75 |
+LICENSE="LGPL-2" |
76 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
77 |
+IUSE="" |
78 |
+ |
79 |
+DEPEND=" |
80 |
+ =kde-frameworks/kauth-${PVCUT}*:5 |
81 |
+ =kde-frameworks/kconfig-${PVCUT}*:5 |
82 |
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5 |
83 |
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5 |
84 |
+ =kde-frameworks/kdeclarative-${PVCUT}*:5 |
85 |
+ =kde-frameworks/kguiaddons-${PVCUT}*:5 |
86 |
+ =kde-frameworks/ki18n-${PVCUT}*:5 |
87 |
+ =kde-frameworks/kitemviews-${PVCUT}*:5 |
88 |
+ =kde-frameworks/kservice-${PVCUT}*:5 |
89 |
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 |
90 |
+ =kde-frameworks/kxmlgui-${PVCUT}*:5 |
91 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
92 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
93 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
94 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
95 |
+" |
96 |
+RDEPEND="${DEPEND}" |
97 |
+ |
98 |
+PATCHES=( "${FILESDIR}/${P}-check-activeModule.patch" ) # bug 710078, in 5.68 |