summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-12-29 17:49:18 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-12-29 20:54:08 +0100
commitd16e0dec7a73f0bdbb00d8f5e679d87b6f4a3563 (patch)
tree1b48e73ec5ee3f4c6744c9f07462fd96d6368bd6 /kde-frameworks
parentx11-misc/appmenu-gtk-module: Fix upstream remove-id (diff)
downloadgentoo-d16e0dec7a73f0bdbb00d8f5e679d87b6f4a3563.tar.gz
gentoo-d16e0dec7a73f0bdbb00d8f5e679d87b6f4a3563.tar.bz2
gentoo-d16e0dec7a73f0bdbb00d8f5e679d87b6f4a3563.zip
kde-frameworks/kxmlgui: Fix key recording by setWindow
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430388 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch29
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild58
2 files changed, 87 insertions, 0 deletions
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
new file mode 100644
index 000000000000..ae1269ac6679
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch
@@ -0,0 +1,29 @@
+From 1bd9ac05b0eed3582937829150b31ea48fd95bb0 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Thu, 17 Dec 2020 11:12:40 -0800
+Subject: [PATCH] Fix key recording by setWindow before capture starts.
+
+It is common that during the construction of widget, it is not yet added to
+a window. Thus windowHandle will simply return null in this case. Always set
+the window to before the capture starts.
+
+BUG: 430388
+---
+ src/kkeysequencewidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/kkeysequencewidget.cpp b/src/kkeysequencewidget.cpp
+index a51c6cc..c1f5c42 100644
+--- a/src/kkeysequencewidget.cpp
++++ b/src/kkeysequencewidget.cpp
+@@ -493,6 +493,7 @@ void KKeySequenceWidget::setCheckActionCollections(const QList<KActionCollection
+ //slot
+ void KKeySequenceWidget::captureKeySequence()
+ {
++ d->recorder->setWindow(window()->windowHandle());
+ d->recorder->startRecording();
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild
new file mode 100644
index 000000000000..5a6e29e0ebbd
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2+"
+IUSE=""
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+ >=dev-qt/qtcore-${QTMIN}:5=
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-kwindowsystem.patch
+ "${FILESDIR}"/${P}-fix-key-recording.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # Files are missing; whatever. Bugs 650290, 668198
+ local myctestargs=(
+ -E "(ktoolbar_unittest|kxmlgui_unittest)"
+ )
+
+ ecm_src_test
+}