From 9bcbfbac3dd96cad44cba042b3f36b9c12ba2574 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 8 Sep 2014 20:47:18 -0700 Subject: [PATCH] backport upstream patch to offer full list of keyboard layouts (BGO #729208) --- 0001-keyboard-Include-all-layouts.patch | 35 +++++++++++++++++++++++++ gnome-initial-setup.spec | 9 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-keyboard-Include-all-layouts.patch diff --git a/0001-keyboard-Include-all-layouts.patch b/0001-keyboard-Include-all-layouts.patch new file mode 100644 index 0000000..8c54528 --- /dev/null +++ b/0001-keyboard-Include-all-layouts.patch @@ -0,0 +1,35 @@ +From 198e3bbb080109188d21482214ca829ecbd19628 Mon Sep 17 00:00:00 2001 +From: Marcus Karlsson +Date: Thu, 4 Sep 2014 22:34:27 +0200 +Subject: [PATCH 1/2] keyboard: Include all layouts + +Only a subset of all keyboard layouts are available from the keyboard +page. It is impossible for some users to select the correct layout, and +they are subsequently prevented from using the correct layout through +the rest of the pages. + +Allow the user to select from all keyboard layouts. + +https://bugzilla.gnome.org/show_bug.cgi?id=729208 +--- + gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c +index 14c97a1..a48dcec 100644 +--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c ++++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c +@@ -385,6 +385,10 @@ get_locale_infos (CcInputChooser *chooser) + add_rows_to_list (chooser, list, INPUT_SOURCE_TYPE_XKB, id); + g_list_free (list); + ++ list = gnome_xkb_info_get_all_layouts (priv->xkb_info); ++ add_rows_to_list (chooser, list, INPUT_SOURCE_TYPE_XKB, id); ++ g_list_free (list); ++ + gtk_widget_show_all (priv->input_list); + + out: +-- +2.1.0 + diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 19c7a85..3c59a52 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -1,11 +1,14 @@ Name: gnome-initial-setup Version: 3.13.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrapping your OS License: GPLv2+ URL: https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup Source0: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz +# Backport from upstream https://git.gnome.org/browse/gnome-initial-setup/commit/?id=198e3bbb080109188d21482214ca829ecbd19628 +# Ensure user can pick from full list of keyboard layouts +Patch0: 0001-keyboard-Include-all-layouts.patch %global nm_version 0.9.6.4 %global glib_required_version 2.36.0 @@ -64,6 +67,7 @@ you through configuring it. It is integrated with gdm. %prep %setup -q +%patch0 -p1 -b .all_layouts %build %configure @@ -102,6 +106,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules %changelog +* Mon Sep 08 2014 Adam Williamson - 3.13.5-2 +- backport upstream patch to offer full list of keyboard layouts (BGO #729208) + * Wed Sep 03 2014 Kalev Lember - 3.13.5-1 - Update to 3.13.5