Hello community, here is the log from the commit of package gnome-settings-daemon for openSUSE:Factory checked in at 2017-08-12 19:38:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old) and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon" Sat Aug 12 19:38:20 2017 rev:137 rq:514679 version:3.24.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes 2017-07-28 09:45:16.880220577 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes 2017-08-12 19:38:23.190516236 +0200 @@ -1,0 +2,5 @@ +Mon Jul 31 11:19:54 UTC 2017 - fezh...@suse.com + +- Rebase gnome-settings-daemon-initial-keyboard.patch (bsc#1050812) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.0ZJ3Gk/_old 2017-08-12 19:38:24.574322163 +0200 +++ /var/tmp/diff_new_pack.0ZJ3Gk/_new 2017-08-12 19:38:24.578321602 +0200 @@ -45,7 +45,7 @@ Patch2: gnome-settings-daemon-bnc873545-hide-warnings.patch # PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxi...@suse.com -- monitor off timeout is too short, extends it to 5 min Patch3: gnome-settings-daemon-sle-configure-timeout-blank.patch -# PATCH-NEEDS-REBASE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 feder...@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME -- WAS PATCH-FIX-OPENSUSE +# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 feder...@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME Patch4: gnome-settings-daemon-initial-keyboard.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch bsc#991024 sck...@suse.com -- Add the updates plugin back Patch5: gnome-settings-daemon-bring-back-updates-plugin.patch @@ -159,8 +159,7 @@ %patch2 -p1 %patch3 -p0 %endif -# Patch needs rebase (boo#1050812) -#patch4 -p1 +%patch4 -p1 %if 0%{?suse_version} == 1315 %patch5 -p1 %patch6 -p1 ++++++ gnome-settings-daemon-initial-keyboard.patch ++++++ --- /var/tmp/diff_new_pack.0ZJ3Gk/_old 2017-08-12 19:38:24.614316554 +0200 +++ /var/tmp/diff_new_pack.0ZJ3Gk/_new 2017-08-12 19:38:24.614316554 +0200 @@ -27,14 +27,14 @@ GsdKeyboardManagerPrivate *priv = manager->priv; GVariantBuilder builder; @@ -501,7 +501,7 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager) - g_free (id); - } -- if (!have_default_layout) -+ if (!have_default_layout && running_under_gdm) - g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT); + init_builder_with_sources (&builder, priv->input_sources_settings); - g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder)); +- if (!layouts) { ++ if (!layouts && running_under_gdm) { + g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT); + goto out; + } @@ -653,15 +653,23 @@ maybe_create_initial_settings (GsdKeyboardManager *manager) settings = manager->priv->input_sources_settings;