From 9ac7979cff301ca406abafd4ce15336802d1eb6a Mon Sep 17 00:00:00 2001
From: Michael Dluhosch <michael.dluhosch@gmail.com>
Date: Wed, 15 May 2024 19:37:19 +0200
Subject: [PATCH] xkb: Replaced hardcoded values with compile time options

The core keyboard before this change always used a layout of "us" even if you
configured the build with another default layout.

Signed-off-by: Michael Dluhosch <michael.dluhosch@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1549>
(cherry picked from commit e61bd1e5fd37b5009d3616549da7f2095357bdf8)
---
 hw/xfree86/common/xf86Config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index c3d87fbe23..09e946c9a0 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -893,7 +893,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
         rules = "base";
 
     /* Xkb default options. */
-    XkbInitRules(&set, rules, "pc105", "us", NULL, NULL);
+    XkbInitRules(&set, rules, XKB_DFLT_MODEL, XKB_DFLT_LAYOUT, NULL, NULL);
     XkbSetRulesDflts(&set);
     XkbFreeRMLVOSet(&set, FALSE);