1 |
commit: d16e0dec7a73f0bdbb00d8f5e679d87b6f4a3563 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 29 16:49:18 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 29 19:54:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16e0dec |
7 |
|
8 |
kde-frameworks/kxmlgui: Fix key recording by setWindow |
9 |
|
10 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430388 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../files/kxmlgui-5.77.0-fix-key-recording.patch | 29 +++++++++++ |
15 |
kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild | 58 ++++++++++++++++++++++ |
16 |
2 files changed, 87 insertions(+) |
17 |
|
18 |
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..ae1269ac667 |
21 |
--- /dev/null |
22 |
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch |
23 |
@@ -0,0 +1,29 @@ |
24 |
+From 1bd9ac05b0eed3582937829150b31ea48fd95bb0 Mon Sep 17 00:00:00 2001 |
25 |
+From: Weng Xuetian <wengxt@×××××.com> |
26 |
+Date: Thu, 17 Dec 2020 11:12:40 -0800 |
27 |
+Subject: [PATCH] Fix key recording by setWindow before capture starts. |
28 |
+ |
29 |
+It is common that during the construction of widget, it is not yet added to |
30 |
+a window. Thus windowHandle will simply return null in this case. Always set |
31 |
+the window to before the capture starts. |
32 |
+ |
33 |
+BUG: 430388 |
34 |
+--- |
35 |
+ src/kkeysequencewidget.cpp | 1 + |
36 |
+ 1 file changed, 1 insertion(+) |
37 |
+ |
38 |
+diff --git a/src/kkeysequencewidget.cpp b/src/kkeysequencewidget.cpp |
39 |
+index a51c6cc..c1f5c42 100644 |
40 |
+--- a/src/kkeysequencewidget.cpp |
41 |
++++ b/src/kkeysequencewidget.cpp |
42 |
+@@ -493,6 +493,7 @@ void KKeySequenceWidget::setCheckActionCollections(const QList<KActionCollection |
43 |
+ //slot |
44 |
+ void KKeySequenceWidget::captureKeySequence() |
45 |
+ { |
46 |
++ d->recorder->setWindow(window()->windowHandle()); |
47 |
+ d->recorder->startRecording(); |
48 |
+ } |
49 |
+ |
50 |
+-- |
51 |
+GitLab |
52 |
+ |
53 |
|
54 |
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild |
55 |
new file mode 100644 |
56 |
index 00000000000..5a6e29e0ebb |
57 |
--- /dev/null |
58 |
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild |
59 |
@@ -0,0 +1,58 @@ |
60 |
+# Copyright 1999-2020 Gentoo Authors |
61 |
+# Distributed under the terms of the GNU General Public License v2 |
62 |
+ |
63 |
+EAPI=7 |
64 |
+ |
65 |
+ECM_DESIGNERPLUGIN="true" |
66 |
+PVCUT=$(ver_cut 1-2) |
67 |
+QTMIN=5.15.1 |
68 |
+VIRTUALX_REQUIRED="test" |
69 |
+inherit ecm kde.org |
70 |
+ |
71 |
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" |
72 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
73 |
+LICENSE="LGPL-2+" |
74 |
+IUSE="" |
75 |
+ |
76 |
+# slot op: includes QtCore/private/qlocale_p.h |
77 |
+DEPEND=" |
78 |
+ >=dev-qt/qtcore-${QTMIN}:5= |
79 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
80 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
81 |
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl] |
82 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
83 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
84 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
85 |
+ =kde-frameworks/kconfig-${PVCUT}*:5 |
86 |
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5 |
87 |
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5 |
88 |
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5 |
89 |
+ =kde-frameworks/kguiaddons-${PVCUT}*:5 |
90 |
+ =kde-frameworks/ki18n-${PVCUT}*:5 |
91 |
+ =kde-frameworks/kiconthemes-${PVCUT}*:5 |
92 |
+ =kde-frameworks/kitemviews-${PVCUT}*:5 |
93 |
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 |
94 |
+" |
95 |
+RDEPEND="${DEPEND}" |
96 |
+ |
97 |
+PATCHES=( |
98 |
+ "${FILESDIR}"/${P}-no-kwindowsystem.patch |
99 |
+ "${FILESDIR}"/${P}-fix-key-recording.patch |
100 |
+) |
101 |
+ |
102 |
+src_configure() { |
103 |
+ local mycmakeargs=( |
104 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON |
105 |
+ ) |
106 |
+ |
107 |
+ ecm_src_configure |
108 |
+} |
109 |
+ |
110 |
+src_test() { |
111 |
+ # Files are missing; whatever. Bugs 650290, 668198 |
112 |
+ local myctestargs=( |
113 |
+ -E "(ktoolbar_unittest|kxmlgui_unittest)" |
114 |
+ ) |
115 |
+ |
116 |
+ ecm_src_test |
117 |
+} |