1 |
commit: c87097487b35d526f40477eeca35aee4eabcf4c3 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Thu May 5 18:25:02 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 7 05:28:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8709748 |
7 |
|
8 |
kde-frameworks/kwindowsystem: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/25336 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
...indowsystem-5.90.0-avoid-XKeycodeToKeysym.patch | 50 ---------------------- |
16 |
1 file changed, 50 deletions(-) |
17 |
|
18 |
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch |
19 |
deleted file mode 100644 |
20 |
index a9f47883e6e8..000000000000 |
21 |
--- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch |
22 |
+++ /dev/null |
23 |
@@ -1,50 +0,0 @@ |
24 |
-From 6e3d645d444073097e93520f047bb2321673119a Mon Sep 17 00:00:00 2001 |
25 |
-From: Fabian Vogt <fabian@×××××××××××.de> |
26 |
-Date: Sun, 2 Jan 2022 23:52:07 +0100 |
27 |
-Subject: [PATCH] Avoid XKeycodeToKeysym in KKeyServer::initializeMods |
28 |
- |
29 |
-Xlib functions which work with keyboard mappings have a (Display) internal |
30 |
-cache, which needs to be refreshed on mapping changes by calling |
31 |
-X(kb)RefreshKeyboardMapping on change notify events. |
32 |
- |
33 |
-After Qt switched to XCB, that is no longer happening, and it's also not |
34 |
-possible to get to the XEvent needed for triggering the refresh. Switch |
35 |
-over to using the XCB equivalent and just load the symbols on every invocation. |
36 |
- |
37 |
-BUG: 426684 |
38 |
---- |
39 |
- src/platforms/xcb/kkeyserver.cpp | 4 +++- |
40 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
41 |
- |
42 |
-diff --git a/src/platforms/xcb/kkeyserver.cpp b/src/platforms/xcb/kkeyserver.cpp |
43 |
-index 306c63b..bc43dbd 100644 |
44 |
---- a/src/platforms/xcb/kkeyserver.cpp |
45 |
-+++ b/src/platforms/xcb/kkeyserver.cpp |
46 |
-@@ -496,6 +496,7 @@ bool initializeMods() |
47 |
- } |
48 |
- |
49 |
- checkDisplay(); |
50 |
-+ xcb_key_symbols_t *symbols = xcb_key_symbols_alloc(QX11Info::connection()); |
51 |
- XModifierKeymap *xmk = XGetModifierMapping(QX11Info::display()); |
52 |
- |
53 |
- int min_keycode; |
54 |
-@@ -515,7 +516,7 @@ bool initializeMods() |
55 |
- // found fixes the problem. |
56 |
- for (int j = 0; j < xmk->max_keypermod; ++j) { |
57 |
- for (int k = 0; k < keysyms_per_keycode; ++k) { |
58 |
-- keySymX = XKeycodeToKeysym(QX11Info::display(), xmk->modifiermap[xmk->max_keypermod * i + j], k); |
59 |
-+ keySymX = xcb_key_symbols_get_keysym(symbols, xmk->modifiermap[xmk->max_keypermod * i + j], k); |
60 |
- |
61 |
- switch (keySymX) { |
62 |
- case XK_Alt_L: |
63 |
-@@ -628,6 +629,7 @@ bool initializeMods() |
64 |
- g_rgX11ModInfo[2].modX = g_alt_mask; |
65 |
- g_rgX11ModInfo[3].modX = g_meta_mask; |
66 |
- |
67 |
-+ xcb_key_symbols_free(symbols); |
68 |
- XFreeModifiermap(xmk); |
69 |
- g_bInitializedMods = true; |
70 |
- |
71 |
--- |
72 |
-GitLab |
73 |
- |