File project1.diff of Package gnome-settings-daemon

Overview Repositories Revisions Requests Users Attributes Meta

File project1.diff of Package gnome-settings-daemon (Revision 42f0fd1634957327b878b43d5bee03a0)

Currently displaying revision 42f0fd1634957327b878b43d5bee03a0 , Show latest

--- gnome-settings-daemon.changes.orig
+++ gnome-settings-daemon.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Jun 11 15:30:37 CEST 2009 - vuntz@novell.com
+
+- Add gnome-settings-daemon-filter-invalid-xkb.patch: when the xkb
+  config from gconf can't be used, try to remove invalid xkb
+  layouts first before showing an error dialog. The old gdm used to
+  have invalid layouts.
+
+-------------------------------------------------------------------
 Wed Jun 10 00:02:37 CEST 2009 - vuntz@novell.com
 
 - Add gnome-settings-daemon-try-harder-gdm-layout.patch: try harder
--- gnome-settings-daemon.spec.orig
+++ gnome-settings-daemon.spec
@@ -49,6 +49,8 @@ Patch10:        gnome-settings-daemon-bn
 Patch11:        gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff
 # PATCH-FIX-UPSTREAM # gnome-settings-daemon-try-harder-gdm-layout.patch bgo585290 vuntz@novell.com -- Try harder to use the keyboard layout passed from GDM
 Patch12:        gnome-settings-daemon-try-harder-gdm-layout.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-filter-invalid-xkb.patch bgo585259 vuntz@novell.com -- Filter invalid xkb layouts from the gconf config (usually added by old gdm)
+Patch13:        gnome-settings-daemon-filter-invalid-xkb.patch
 Url:            http://www.gnome.org
 Requires:       %{name}-lang = %{version}
 Obsoletes:      resapplet
@@ -108,6 +110,7 @@ gnome-patch-translation-prepare
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 gnome-patch-translation-update
 
 %build

Places

File project1.diff of Package gnome-settings-daemon (Revision 42f0fd1634957327b878b43d5bee03a0)

Places