[rpms/plymouth] rawhide: Fix keyboard-layout sometimes being stuck at English (rhbz#2481687)

[rpms/plymouth] rawhide: Fix keyboard-layout sometimes being stuck at English (rhbz#2481687)

[Hans de Goede]

            A new commit has been pushed.

            Repo   : rpms/plymouth
            Branch : rawhide
            Commit : dd58b0075b04fc35f84a2623f1241d949694d09a
            Author : Hans de Goede <johannes.goede@oss.qualcomm.com>
            Date   : 2026-06-22T17:46:14+02:00
            Stats  : +33/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/plymouth/c/dd58b0075b04fc35f84a2623f1241d949694d09a?branch=rawhide

            Log:
            Fix keyboard-layout sometimes being stuck at English (rhbz#2481687)

Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>

---
diff --git a/0001-ply-device-manager-fix-default-XKB-keymap-fallback-o.patch b/0001-ply-device-manager-fix-default-XKB-keymap-fallback-o.patch
new file mode 100644
index 0000000..95eda62
--- /dev/null
+++ b/0001-ply-device-manager-fix-default-XKB-keymap-fallback-o.patch
@@ -0,0 +1,29 @@
+From cea90be39d263e388003a07d125b469c0803d55c Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Fri, 17 Apr 2026 09:56:27 -0700
+Subject: [PATCH] ply-device-manager: fix default XKB keymap fallback
+ overriding KEYMAP
+
+Only use XKB with libxkbcommon defaults when no layout is configured, but
+fall back to VT-based input when KEYMAP is set without XKBLAYOUT. This
+preserves any user console keymap configuration.
+---
+ src/libply-splash-core/ply-device-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
+index 016ac332..aacab4d3 100644
+--- a/src/libply-splash-core/ply-device-manager.c
++++ b/src/libply-splash-core/ply-device-manager.c
+@@ -833,7 +833,7 @@ parse_vconsole_conf (ply_device_manager_t *manager)
+ 
+         ply_trace ("KEYMAP: %s, XKBLAYOUT: %s, XKBMODEL %s, XKBVARIANT: %s, XKBOPTIONS: %s\n", keymap, xkb_layout, xkb_model, xkb_variant, xkb_options);
+ 
+-        if (manager->xkb_context != NULL) {
++        if (manager->xkb_context != NULL && (xkb_layout != NULL || keymap == NULL)) {
+                 struct xkb_rule_names xkb_keymap = {
+                         .layout  = xkb_layout,
+                         .model   = xkb_model,
+-- 
+2.54.0
+

diff --git a/plymouth.spec b/plymouth.spec
index cc6d428..fd7f996 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -12,6 +12,10 @@ Source1: charge.plymouth
 # sometimes load while drm plugin is already handling the display
 Patch: 0001-ply-device-manager-Fix-race-in-fb_device_has_drm_dev.patch
 
+# For https://bugzilla.redhat.com/show_bug.cgi?id=2481687
+# https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/cea90be39d263e388003a07d125b469c0803d55c
+Patch: 0001-ply-device-manager-fix-default-XKB-keymap-fallback-o.patch
+
 BuildRequires: meson
 BuildRequires: system-logos
 BuildRequires: gcc libtool git