Hello community, here is the log from the commit of package gnome-settings-daemon checked in at Mon May 26 19:03:24 CEST 2008. -------- --- GNOME/gnome-settings-daemon/gnome-settings-daemon.changes 2008-05-06 12:54:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-settings-daemon/gnome-settings-daemon.changes 2008-05-26 17:05:16.932184000 +0200 @@ -1,0 +2,8 @@ +Mon May 26 17:10:43 CEST 2008 - vuntz@suse.de + +- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to + unbreak corrupted keymaps on automatic login. This is only a + workaround for openSUSE 11.0, unfortunately, since nobody found + the right fix yet. Fix bnc#369263. + +------------------------------------------------------------------- New: ---- gnome-settings-daemon-bnc369263-broken-xkb-layout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.J19110/_old 2008-05-26 19:03:18.000000000 +0200 +++ /var/tmp/diff_new_pack.J19110/_new 2008-05-26 19:03:18.000000000 +0200 @@ -17,13 +17,15 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.22.1 -Release: 13 +Release: 19 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch Patch2: %{name}-system-proxy-configuration.patch # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-1.2.diff -- Add support for RandR 1.2 to the daemon. federico@novell.com Patch3: gnome-settings-daemon-randr-1.2.diff +# PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc369263-broken-xkb-layout.patch bnc369263 bfo16105 vuntz@novell.com -- This is a hack to fix a major bug. +Patch4: gnome-settings-daemon-bnc369263-broken-xkb-layout.patch Url: http://www.gnome.org Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -79,6 +81,7 @@ #gnome-patch-translation-prepare %patch2 %patch3 -p1 +%patch4 -p1 #gnome-patch-translation-update %build @@ -130,6 +133,11 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon May 26 2008 vuntz@suse.de +- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to + unbreak corrupted keymaps on automatic login. This is only a + workaround for openSUSE 11.0, unfortunately, since nobody found + the right fix yet. Fix bnc#369263. * Tue May 06 2008 rodrigo@suse.de - Updated gnome-settings-daemon-system-proxy-configuration.patch to add a missing return in non-void function ++++++ gnome-settings-daemon-bnc369263-broken-xkb-layout.patch ++++++ This is really only a workaround to unbreak things on startup. We need more time to investigate what the real fix is, and we don't have enough time for openSUSE 11.0. Index: gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c =================================================================== --- gnome-settings-daemon-2.22.1.orig/plugins/keyboard/gsd-keyboard-manager.c +++ gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c @@ -410,6 +410,7 @@ gsd_keyboard_manager_start (GsdKeyboardM GError **error) { GConfClient *client; + char *program; gnome_settings_profile_start (NULL); @@ -430,6 +431,12 @@ gsd_keyboard_manager_start (GsdKeyboardM apply_settings (client, 0, NULL, manager); g_object_unref (client); + program = g_find_program_in_path ("setxkbmap"); + if (program != NULL) { + g_spawn_command_line_async (program, NULL); + g_free (program); + } + gnome_settings_profile_end (NULL); return TRUE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org