From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05D4E13835A for ; Sat, 23 Jan 2021 00:25:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D54FE0BE6; Sat, 23 Jan 2021 00:25:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19F83E0BE6 for ; Sat, 23 Jan 2021 00:25:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46CAD340A51 for ; Sat, 23 Jan 2021 00:25:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7690C4AA for ; Sat, 23 Jan 2021 00:25:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1611361537.c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r2.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11 X-VCS-Branch: master Date: Sat, 23 Jan 2021 00:25:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 32b6864f-60d9-480f-84b2-96584371f8f8 X-Archives-Hash: 4ccf149e66355939dfcae2c037998922 commit: c8f37e9a713ce4b2ac18071dcdaa1f96c7d1cf11 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 22 20:59:03 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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() {