diff --git a/0001-users-Read-product-from-the-device-tree-on-DT-platfo.patch b/0001-users-Read-product-from-the-device-tree-on-DT-platfo.patch index fc5560c..e097576 100644 --- a/0001-users-Read-product-from-the-device-tree-on-DT-platfo.patch +++ b/0001-users-Read-product-from-the-device-tree-on-DT-platfo.patch @@ -1,7 +1,7 @@ From 1a123b97ab76880379a19d3a4027081fa092672d Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Fri, 18 Mar 2022 08:51:42 +0900 -Subject: [PATCH 1/7] [users] Read product from the device tree on DT platforms +Subject: [PATCH 1/8] [users] Read product from the device tree on DT platforms Non-DMI platforms may have a device tree instead (e.g. many embedded devices, Apple Silicon Macs). If we find a model string in the DT, use diff --git a/0002-users-Clean-up-DMI-model-more-for-hostname.patch b/0002-users-Clean-up-DMI-model-more-for-hostname.patch index 5e9f393..2636aaa 100644 --- a/0002-users-Clean-up-DMI-model-more-for-hostname.patch +++ b/0002-users-Clean-up-DMI-model-more-for-hostname.patch @@ -1,7 +1,7 @@ From 43bc66040823494d495af28f873290acde07527f Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sun, 6 Aug 2023 20:00:52 +0900 -Subject: [PATCH 2/7] [users] Clean up DMI model more for hostname +Subject: [PATCH 2/8] [users] Clean up DMI model more for hostname Remove anything in parentheses, and also drop the "Apple" prefix for Apple machines. This converts: diff --git a/0003-keyboard-Add-support-for-setting-the-layout-via-loca.patch b/0003-keyboard-Add-support-for-setting-the-layout-via-loca.patch index 9c103a1..c38f5fb 100644 --- a/0003-keyboard-Add-support-for-setting-the-layout-via-loca.patch +++ b/0003-keyboard-Add-support-for-setting-the-layout-via-loca.patch @@ -1,7 +1,7 @@ From c9cc736c45595ef3e903329d4027e8f379d89f31 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sat, 12 Aug 2023 21:12:22 +0900 -Subject: [PATCH 3/7] [keyboard] Add support for setting the layout via locale1 +Subject: [PATCH 3/8] [keyboard] Add support for setting the layout via locale1 setxkbmap only works on X11/XWayland, and even on XWayland does not correctly change the Wayland keyboard layout. diff --git a/0004-keyboard-Add-support-for-getting-the-layout-via-loca.patch b/0004-keyboard-Add-support-for-getting-the-layout-via-loca.patch index 78f6e3f..30fd429 100644 --- a/0004-keyboard-Add-support-for-getting-the-layout-via-loca.patch +++ b/0004-keyboard-Add-support-for-getting-the-layout-via-loca.patch @@ -1,7 +1,7 @@ From 08737fdc840bfa58caff7fea8a8b58a90865bdeb Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sat, 12 Aug 2023 21:41:37 +0900 -Subject: [PATCH 4/7] [keyboard] Add support for getting the layout via locale1 +Subject: [PATCH 4/8] [keyboard] Add support for getting the layout via locale1 Getter counterpart to the previous commit, to support using locale1 to fetch the current keyboard config. diff --git a/0005-keyboard-Do-not-update-configs-in-locale1-mode-when-.patch b/0005-keyboard-Do-not-update-configs-in-locale1-mode-when-.patch index d89e8ef..05779ce 100644 --- a/0005-keyboard-Do-not-update-configs-in-locale1-mode-when-.patch +++ b/0005-keyboard-Do-not-update-configs-in-locale1-mode-when-.patch @@ -1,7 +1,7 @@ From 34cabb69f88d66bfdf982b72f84054c917405056 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sat, 12 Aug 2023 21:18:18 +0900 -Subject: [PATCH 5/7] [keyboard] Do not update configs in locale1 mode when +Subject: [PATCH 5/8] [keyboard] Do not update configs in locale1 mode when root is / If Calamares is running with no root path and we are using locale1 to diff --git a/0006-keyboard-Add-an-option-to-disable-layout-guessing.patch b/0006-keyboard-Add-an-option-to-disable-layout-guessing.patch index 1f495b1..ecc7d39 100644 --- a/0006-keyboard-Add-an-option-to-disable-layout-guessing.patch +++ b/0006-keyboard-Add-an-option-to-disable-layout-guessing.patch @@ -1,7 +1,7 @@ From 1681cfba8e267c746969bde9a93d75e52db953b3 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sat, 12 Aug 2023 21:42:54 +0900 -Subject: [PATCH 6/7] [keyboard] Add an option to disable layout guessing +Subject: [PATCH 6/8] [keyboard] Add an option to disable layout guessing If the system has already pre-configured a sensible keyboard layout, we do not need to guess based on the locale. Add a config option to keep diff --git a/0007-keyboard-Use-the-current-keyboard-model-as-the-defau.patch b/0007-keyboard-Use-the-current-keyboard-model-as-the-defau.patch index cb63e3e..02a7135 100644 --- a/0007-keyboard-Use-the-current-keyboard-model-as-the-defau.patch +++ b/0007-keyboard-Use-the-current-keyboard-model-as-the-defau.patch @@ -1,7 +1,7 @@ From 8cfae8e42a40acdaea5709f2ba042e2ddf7328f0 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sat, 12 Aug 2023 22:09:31 +0900 -Subject: [PATCH 7/7] [keyboard] Use the current keyboard model as the default +Subject: [PATCH 7/8] [keyboard] Use the current keyboard model as the default If there is a valid keyboard model set in the system already, keep it. This allows distributors to preconfigure the correct model if known. diff --git a/0008-keyboard-Fix-locale1-support-for-alternate-layouts.patch b/0008-keyboard-Fix-locale1-support-for-alternate-layouts.patch new file mode 100644 index 0000000..15a2c30 --- /dev/null +++ b/0008-keyboard-Fix-locale1-support-for-alternate-layouts.patch @@ -0,0 +1,30 @@ +From 5d68130b4a13714e0a64967babcb6405756612e7 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Sat, 2 Sep 2023 22:12:40 +0900 +Subject: [PATCH 8/8] [keyboard] Fix locale1 support for alternate layouts + +Copy&paste error caused setting the layout to fail for non-ASCII layouts +with an alternate layout/variant. + +Fixes: c9cc736c4 (\"[keyboard] Add support for setting the layout via locale1\") +Signed-off-by: Hector Martin +--- + src/modules/keyboard/Config.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp +index f8d9f8d01..4cd4af2bc 100644 +--- a/src/modules/keyboard/Config.cpp ++++ b/src/modules/keyboard/Config.cpp +@@ -238,7 +238,7 @@ Config::locale1Apply() + if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() ) + { + layout = m_additionalLayoutInfo.additionalLayout + "," + layout; +- variant = m_additionalLayoutInfo.additionalVariant + "," + layout; ++ variant = m_additionalLayoutInfo.additionalVariant + "," + variant; + option = m_additionalLayoutInfo.groupSwitcher; + } + +-- +2.41.0 + diff --git a/calamares.spec b/calamares.spec index b187a0b..9ef862e 100644 --- a/calamares.spec +++ b/calamares.spec @@ -10,7 +10,7 @@ Name: calamares Version: 3.2.62 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ @@ -38,6 +38,7 @@ Patch0004: 0004-keyboard-Add-support-for-getting-the-layout-via-loca.patch Patch0005: 0005-keyboard-Do-not-update-configs-in-locale1-mode-when-.patch Patch0006: 0006-keyboard-Add-an-option-to-disable-layout-guessing.patch Patch0007: 0007-keyboard-Use-the-current-keyboard-model-as-the-defau.patch +Patch0008: 0008-keyboard-Fix-locale1-support-for-alternate-layouts.patch # Fedora-specific changes ## adjust some default settings (default shipped .conf files) @@ -359,6 +360,9 @@ EOF %changelog +* Sat Sep 02 2023 Neal Gompa - 3.2.62-2 +- Refresh backported patch stack + * Sat Sep 02 2023 Neal Gompa - 3.2.62-1 - Update to 3.2.62 and backport fixes for Asahi