1 |
commit: e15789b6d8c953641e9181fcbfdb869f28b2b8f1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 27 16:39:57 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 27 17:45:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e15789b6 |
7 |
|
8 |
kde-plasma/kwin: Backport possible fix for bugs on X11 like #616592 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
.../kwin/files/kwin-5.10.4-globalaccel.patch | 45 ++++++++++ |
13 |
kde-plasma/kwin/kwin-5.10.4-r1.ebuild | 98 ++++++++++++++++++++++ |
14 |
2 files changed, 143 insertions(+) |
15 |
|
16 |
diff --git a/kde-plasma/kwin/files/kwin-5.10.4-globalaccel.patch b/kde-plasma/kwin/files/kwin-5.10.4-globalaccel.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..88d373c1dde |
19 |
--- /dev/null |
20 |
+++ b/kde-plasma/kwin/files/kwin-5.10.4-globalaccel.patch |
21 |
@@ -0,0 +1,45 @@ |
22 |
+From 4c996a57d4c01f092f9ed8f98a9f476c14c0c777 Mon Sep 17 00:00:00 2001 |
23 |
+From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@×××.org> |
24 |
+Date: Thu, 20 Jul 2017 19:14:07 +0200 |
25 |
+Subject: Call Platform::setupActionForGlobalAccel on the Client shortcut |
26 |
+ |
27 |
+Summary: |
28 |
+Platform::setupActionForGlobalAccel is an important call on X11 platform. |
29 |
+Without the x11 timestamp doesn't get updated and calls in KWin might |
30 |
+fail - e.g. the activation of the Client which is supposed to happen. |
31 |
+ |
32 |
+Test Plan: compiles |
33 |
+ |
34 |
+Reviewers: #kwin, #plasma |
35 |
+ |
36 |
+Subscribers: plasma-devel, kwin |
37 |
+ |
38 |
+Tags: #kwin |
39 |
+ |
40 |
+Differential Revision: https://phabricator.kde.org/D6802 |
41 |
+--- |
42 |
+ useractions.cpp | 2 ++ |
43 |
+ 1 file changed, 2 insertions(+) |
44 |
+ |
45 |
+diff --git a/useractions.cpp b/useractions.cpp |
46 |
+index 502be96..d92b027 100644 |
47 |
+--- a/useractions.cpp |
48 |
++++ b/useractions.cpp |
49 |
+@@ -37,6 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. |
50 |
+ #include "input.h" |
51 |
+ #include "workspace.h" |
52 |
+ #include "effects.h" |
53 |
++#include "platform.h" |
54 |
+ #include "screens.h" |
55 |
+ #include "virtualdesktops.h" |
56 |
+ #include "scripting/scripting.h" |
57 |
+@@ -1050,6 +1051,7 @@ void Workspace::clientShortcutUpdated(Client* c) |
58 |
+ if (!c->shortcut().isEmpty()) { |
59 |
+ if (action == NULL) { // new shortcut |
60 |
+ action = new QAction(this); |
61 |
++ kwinApp()->platform()->setupActionForGlobalAccel(action); |
62 |
+ action->setProperty("componentName", QStringLiteral(KWIN_NAME)); |
63 |
+ action->setObjectName(key); |
64 |
+ action->setText(i18n("Activate Window (%1)", c->caption())); |
65 |
+-- |
66 |
+cgit v0.11.2 |
67 |
|
68 |
diff --git a/kde-plasma/kwin/kwin-5.10.4-r1.ebuild b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild |
69 |
new file mode 100644 |
70 |
index 00000000000..5dd83a93812 |
71 |
--- /dev/null |
72 |
+++ b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild |
73 |
@@ -0,0 +1,98 @@ |
74 |
+# Copyright 1999-2017 Gentoo Foundation |
75 |
+# Distributed under the terms of the GNU General Public License v2 |
76 |
+ |
77 |
+EAPI=6 |
78 |
+ |
79 |
+KDE_HANDBOOK="optional" |
80 |
+KDE_TEST="optional" |
81 |
+VIRTUALX_REQUIRED="test" |
82 |
+inherit kde5 |
83 |
+ |
84 |
+DESCRIPTION="KDE window manager" |
85 |
+LICENSE="GPL-2+" |
86 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
87 |
+IUSE="gles2 multimedia" |
88 |
+ |
89 |
+COMMON_DEPEND=" |
90 |
+ $(add_frameworks_dep kactivities) |
91 |
+ $(add_frameworks_dep kauth) |
92 |
+ $(add_frameworks_dep kcmutils) |
93 |
+ $(add_frameworks_dep kcompletion) |
94 |
+ $(add_frameworks_dep kconfig) |
95 |
+ $(add_frameworks_dep kconfigwidgets) |
96 |
+ $(add_frameworks_dep kcoreaddons) |
97 |
+ $(add_frameworks_dep kcrash) |
98 |
+ $(add_frameworks_dep kdeclarative) |
99 |
+ $(add_frameworks_dep kglobalaccel) |
100 |
+ $(add_frameworks_dep ki18n) |
101 |
+ $(add_frameworks_dep kiconthemes) |
102 |
+ $(add_frameworks_dep kidletime) |
103 |
+ $(add_frameworks_dep kinit) |
104 |
+ $(add_frameworks_dep kio) |
105 |
+ $(add_frameworks_dep knewstuff) |
106 |
+ $(add_frameworks_dep knotifications) |
107 |
+ $(add_frameworks_dep kpackage) |
108 |
+ $(add_frameworks_dep kservice) |
109 |
+ $(add_frameworks_dep kwayland) |
110 |
+ $(add_frameworks_dep kwidgetsaddons) |
111 |
+ $(add_frameworks_dep kwindowsystem X) |
112 |
+ $(add_frameworks_dep kxmlgui) |
113 |
+ $(add_frameworks_dep plasma) |
114 |
+ $(add_plasma_dep breeze) |
115 |
+ $(add_plasma_dep kdecoration) |
116 |
+ $(add_plasma_dep kscreenlocker) |
117 |
+ $(add_qt_dep qtcore) |
118 |
+ $(add_qt_dep qtdbus) |
119 |
+ $(add_qt_dep qtdeclarative) |
120 |
+ $(add_qt_dep qtgui 'gles2=') |
121 |
+ $(add_qt_dep qtscript) |
122 |
+ $(add_qt_dep qtwidgets) |
123 |
+ $(add_qt_dep qtx11extras) |
124 |
+ >=dev-libs/libinput-1.5 |
125 |
+ >=dev-libs/wayland-1.2 |
126 |
+ media-libs/fontconfig |
127 |
+ media-libs/freetype |
128 |
+ media-libs/libepoxy |
129 |
+ media-libs/mesa[egl,gbm,gles2?,wayland] |
130 |
+ virtual/libudev:= |
131 |
+ x11-libs/libICE |
132 |
+ x11-libs/libSM |
133 |
+ x11-libs/libX11 |
134 |
+ x11-libs/libXi |
135 |
+ x11-libs/libdrm |
136 |
+ >=x11-libs/libxcb-1.10 |
137 |
+ >=x11-libs/libxkbcommon-0.7.0 |
138 |
+ x11-libs/xcb-util-cursor |
139 |
+ x11-libs/xcb-util-image |
140 |
+ x11-libs/xcb-util-keysyms |
141 |
+" |
142 |
+RDEPEND="${COMMON_DEPEND} |
143 |
+ $(add_plasma_dep kde-cli-tools) |
144 |
+ multimedia? ( |
145 |
+ || ( |
146 |
+ $(add_qt_dep qtmultimedia 'gstreamer,qml') |
147 |
+ $(add_qt_dep qtmultimedia 'gstreamer010,qml') |
148 |
+ ) |
149 |
+ ) |
150 |
+ !<kde-apps/kdeartwork-meta-15.08.3-r1:4 |
151 |
+ !kde-plasma/kwin:4 |
152 |
+ !kde-plasma/systemsettings:4 |
153 |
+" |
154 |
+DEPEND="${COMMON_DEPEND} |
155 |
+ $(add_qt_dep designer) |
156 |
+ $(add_qt_dep qtconcurrent) |
157 |
+ x11-proto/xproto |
158 |
+ test? ( x11-libs/xcb-util-wm ) |
159 |
+" |
160 |
+ |
161 |
+RESTRICT+=" test" |
162 |
+ |
163 |
+PATCHES=( |
164 |
+ "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" |
165 |
+ "${FILESDIR}/${P}-globalaccel.patch" |
166 |
+) |
167 |
+ |
168 |
+src_prepare() { |
169 |
+ kde5_src_prepare |
170 |
+ use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch" |
171 |
+} |