[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 20:59:03 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 00:25:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f37e9a

kde-plasma/plasma-workspace: startplasma-wayland: fix XKB variable setup

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ace-5.20.5-wayland-fix-XKB-variable-setup.patch | 35 ++++++++++++++++++++++
 .../plasma-workspace-5.20.5-r2.ebuild              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
new file mode 100644
index 00000000000..3018b73cefa
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
@@ -0,0 +1,35 @@
+From 2a6718ff53aa70d3a6c0d9a78a7aaa491907b130 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 18 Jan 2021 12:56:00 +0000
+Subject: [PATCH] startplasma-wayland: Fix XKB variable setup
+
+When this was ported to C++, it missed the actual variable assignments.
+
+
+(cherry picked from commit 76088e21ea2ec09d13bd462d61c4b8ffc7bc4729)
+---
+ startkde/startplasma-wayland.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
+index 500435853..38e325843 100644
+--- a/startkde/startplasma-wayland.cpp
++++ b/startkde/startplasma-wayland.cpp
+@@ -61,10 +61,10 @@ int main(int argc, char** argv)
+                     qputenv(var, r.toUtf8());
+             };
+ 
+-            queryAndSet("X11MODEL", QStringLiteral("X11Model"));
+-            queryAndSet("X11LAYOUT", QStringLiteral("X11Layout"));
+-            queryAndSet("X11VARIANT", QStringLiteral("X11Variant"));
+-            queryAndSet("X11OPTIONS", QStringLiteral("X11Options"));
++            queryAndSet("XKB_DEFAULT_MODEL", QStringLiteral("X11Model"));
++            queryAndSet("XKB_DEFAULT_LAYOUT", QStringLiteral("X11Layout"));
++            queryAndSet("XKB_DEFAULT_VARIANT", QStringLiteral("X11Variant"));
++            queryAndSet("XKB_DEFAULT_OPTIONS", QStringLiteral("X11Options"));
+         } else {
+             qWarning() << "not a reply org.freedesktop.locale1" << resultMessage;
+         }
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
index 209e7b0694d..c6598847b3c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild
@@ -147,6 +147,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
 	"${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
 	"${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433
+	"${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch"
 )
 
 src_prepare() {