git: 9c1009978588 - main - x11/sddm: Allow sddm_xkb_layout to be completely overriden from rc.conf

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9c100997858850916201b483b2662b70760163e8

commit 9c100997858850916201b483b2662b70760163e8
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-10-14 10:17:53 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-10-14 10:20:30 +0000

    x11/sddm: Allow sddm_xkb_layout to be completely overriden from rc.conf
    
    PR:             296696
---
 x11/sddm/files/patch-data_scripts_Xsetup | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/x11/sddm/files/patch-data_scripts_Xsetup b/x11/sddm/files/patch-data_scripts_Xsetup
index 988dac46f9df..cf4a456400a2 100644
--- a/x11/sddm/files/patch-data_scripts_Xsetup
+++ b/x11/sddm/files/patch-data_scripts_Xsetup
@@ -1,20 +1,19 @@
 --- data/scripts/Xsetup.orig	2025-01-31 09:57:01 UTC
 +++ data/scripts/Xsetup
-@@ -1,3 +1,17 @@
+@@ -1,3 +1,16 @@
  #!/bin/sh
  # Xsetup - run as root before the login dialog appears
  
-+if /usr/sbin/sysrc -ne sddm_xkb_layout; then
-+    sddm_xkb_layout=$(/usr/sbin/sysrc -ne sddm_xkb_layout)
-+elif /usr/sbin/sysrc -ne sddm_lang; then
++if /usr/sbin/sysrc -ne sddm_lang; then
 +    sddm_lang=$(/usr/sbin/sysrc -ne sddm_lang)
 +    sddm_xkb_layout=$(echo $sddm_lang | sed 's/.*_//' | tr '[:upper:]' '[:lower:]')
++    sddm_xkb_layout="us,${sddm_xkb_layout}"
 +else
 +    sddm_xkb_layout="us"
 +fi
 +
-+if [ "$sddm_xkb_layout" != "us" ]; then
-+    sddm_xkb_layout="us,${sddm_xkb_layout}"
++if /usr/sbin/sysrc -ne sddm_xkb_layout; then
++    sddm_xkb_layout=$(/usr/sbin/sysrc -ne sddm_xkb_layout)
 +fi
 +
 +setxkbmap -layout $sddm_xkb_layout