diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-22 21:59:03 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-23 01:25:37 +0100 |
| commit | c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11 (patch) | |
| tree | d8b8a9841e2ba8c936bcc3751469cef700f42403 /kde-plasma/plasma-workspace | |
| parent | kde-plasma/plasma-workspace: digitalclock: fix showing agenda view (diff) | |
| download | gentoo-c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11.tar.gz gentoo-c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11.tar.bz2 gentoo-c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11.zip | |
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@gentoo.org>
Diffstat (limited to 'kde-plasma/plasma-workspace')
| -rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch | 35 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild | 1 |
2 files changed, 36 insertions, 0 deletions
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 000000000000..3018b73cefa0 --- /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 209e7b0694d6..c6598847b3cf 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() { |