gentoo resync : 02.02.2022

3 files changed, 54 insertions, 1 deletions

diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 3f0ccfb3355f..7a1367a289ae 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,6 @@
+AUX kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch 1918 BLAKE2B 2407fc4cd4ebf3f3979be4dcc2f9d9859c7dedfd03d797e150d42989d2ce1008294d1a29ee0edbf1455863f4e75663c1622a066898dc06967b883a00d361840e SHA512 633719c5f28cc515fa5623f57813b2f3e88cf933343b68b2a13e32a5910af6fb1a7b023c95e5b98f994f08e7e9b778d2a6728b4f8b31559fb021dd3b303bb9ce
 DIST kwindowsystem-5.88.0.tar.xz 179400 BLAKE2B f2798ae0fa85674ecaf7d5faa55460adffc180cde49cd00051480495ae8dd1a72e851d3138dfb97d097049fc68208bcd9a094b620ecd3eac3e2be5a271acfce7 SHA512 1863cf4185d2920e46511ec247165c1af8a6035a62a12db9c0a39ac3ebb0c701ab01072d919d115ce2288ecbccb5cdaf66d055cc372270dcf8979ca9e227bdf0
 DIST kwindowsystem-5.90.0.tar.xz 182024 BLAKE2B 8b7a451d8b0b713b07f10f459e816a31209fb0606c4810691517d9f3892840e0633989759e2ce5d767f04b59cbbca7c55f44818d90dc2b869ce587e798c89c19 SHA512 c63417e4c2e33f1b08898722f582324b72beae9e1931f08e6866bc6939681a612a30cd704236ae373aa075ef94f73f8868c92558a21e4849d6d0c467574916a2
 EBUILD kwindowsystem-5.88.0.ebuild 856 BLAKE2B 322e2a182351ae4bfc21761d4a6f7b3786ae91ac3c4504e10a7acb5885025fafaa25f5660740fb78b4a2bf1ac96b2b67078e71f6885452a739c3becb75a386a4 SHA512 ee4638e1ca03a993108b5a635102c8eabeaf919b014d4bae07b787bc063271bb35e430123823f53990e3042f292456fbe36a206df9459b405932d8e3f9bf89b1
-EBUILD kwindowsystem-5.90.0.ebuild 859 BLAKE2B d59136393021043eb28e79e41aadb00355144165bb27e5059dbfa0b0173202b3d5923169e31e947f4322ac8f20890382970be876aeb54d5734525344d7f76f8b SHA512 f200fbc76e1666f7aed1ea2e9f7bae12048f77042ee2ec16eeac2d0059b1973db69a4b7a4b8d1c72efdaf7c43fb3863cd663f1ae20989a11bccd9a563948f50b
+EBUILD kwindowsystem-5.90.0-r1.ebuild 937 BLAKE2B 47b66476f09cbdef8527c6acbe37c9856bb7293292ac80361cf88f2261638bf5a24598aaf703543355d66be2292b8ff941f81e9512fa252e8f7532fc9ad02e6f SHA512 67c78ee835b003694cfa8fd5326e7769ffe8621b3f297759d9e5a007f8a2aafc183b84ae77c36e0c2d59e47c1aa4885cd6e81509c45b538f62c796f1510d7f47
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
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
new file mode 100644
index 000000000000..a9f47883e6e8
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch
@@ -0,0 +1,50 @@
+From 6e3d645d444073097e93520f047bb2321673119a Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sun, 2 Jan 2022 23:52:07 +0100
+Subject: [PATCH] Avoid XKeycodeToKeysym in KKeyServer::initializeMods
+
+Xlib functions which work with keyboard mappings have a (Display) internal
+cache, which needs to be refreshed on mapping changes by calling
+X(kb)RefreshKeyboardMapping on change notify events.
+
+After Qt switched to XCB, that is no longer happening, and it's also not
+possible to get to the XEvent needed for triggering the refresh. Switch
+over to using the XCB equivalent and just load the symbols on every invocation.
+
+BUG: 426684
+---
+ src/platforms/xcb/kkeyserver.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/platforms/xcb/kkeyserver.cpp b/src/platforms/xcb/kkeyserver.cpp
+index 306c63b..bc43dbd 100644
+--- a/src/platforms/xcb/kkeyserver.cpp
++++ b/src/platforms/xcb/kkeyserver.cpp
+@@ -496,6 +496,7 @@ bool initializeMods()
+     }
+ 
+     checkDisplay();
++    xcb_key_symbols_t *symbols = xcb_key_symbols_alloc(QX11Info::connection());
+     XModifierKeymap *xmk = XGetModifierMapping(QX11Info::display());
+ 
+     int min_keycode;
+@@ -515,7 +516,7 @@ bool initializeMods()
+         // found fixes the problem.
+         for (int j = 0; j < xmk->max_keypermod; ++j) {
+             for (int k = 0; k < keysyms_per_keycode; ++k) {
+-                keySymX = XKeycodeToKeysym(QX11Info::display(), xmk->modifiermap[xmk->max_keypermod * i + j], k);
++                keySymX = xcb_key_symbols_get_keysym(symbols, xmk->modifiermap[xmk->max_keypermod * i + j], k);
+ 
+                 switch (keySymX) {
+                 case XK_Alt_L:
+@@ -628,6 +629,7 @@ bool initializeMods()
+     g_rgX11ModInfo[2].modX = g_alt_mask;
+     g_rgX11ModInfo[3].modX = g_meta_mask;
+ 
++    xcb_key_symbols_free(symbols);
+     XFreeModifiermap(xmk);
+     g_bInitializedMods = true;
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0-r1.ebuild
index e0af04ee37a0..9b74f0ae66e9 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0-r1.ebuild
@@ -34,6 +34,8 @@ BDEPEND="
 
 DOCS=( docs/README.kstartupinfo )
 
+PATCHES=( "${FILESDIR}/${P}-avoid-XKeycodeToKeysym.patch" ) # KDE-bug 426684
+
 src_configure() {
 	local mycmakeargs=(
 		-DKWINDOWSYSTEM_NO_WIDGETS=ON