pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 513163 from home:zhangxiaofei:branches:GNOME:Factory

Browse Source 
- Rebase gnome-settings-daemon-initial-keyboard.patch (bsc#1050812)

OBS-URL: https://build.opensuse.org/request/show/513163
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=292
This commit is contained in:
Bjørn Lie 2017-08-05 11:50:54 +00:00 committed by Git OBS Bridge
parent 030326f2cb
commit 4e1baa12b9
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnome-settings-daemon-initial-keyboard.patch
View File

@ -27,14 +27,14 @@ index eb75c92..06be608 100644
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)
init_builder_with_sources (&builder, priv->input_sources_settings);
- if (!layouts) {
+ if (!layouts && running_under_gdm) {
g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
goto out;
}
@@ -653,15 +653,23 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
settings = manager->priv->input_sources_settings;

5
gnome-settings-daemon.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 31 11:19:54 UTC 2017 - fezhang@suse.com
- Rebase gnome-settings-daemon-initial-keyboard.patch (bsc#1050812)
-------------------------------------------------------------------
Sat Jul 22 17:03:30 UTC 2017 - zaitor@opensuse.org

5
gnome-settings-daemon.spec
View File

@ -45,7 +45,7 @@ Patch1: gnome-settings-daemon-notify-idle-resumed.patch
Patch2: gnome-settings-daemon-bnc873545-hide-warnings.patch
# PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@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 federico@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 federico@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 sckang@suse.com -- Add the updates plugin back
Patch5: gnome-settings-daemon-bring-back-updates-plugin.patch
@ -159,8 +159,7 @@ gnome-patch-translation-prepare
%patch2 -p1
%patch3 -p0
%endif
# Patch needs rebase (boo#1050812)
#patch4 -p1
%patch4 -p1
%if 0%{?suse_version} == 1315
%patch5 -p1
%patch6 -p1