rpms/gdm/devel xklavier4.patch,NONE,1.1 gdm.spec,1.472,1.473

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5125

Modified Files:
	gdm.spec 
Added Files:
	xklavier4.patch 
Log Message:
fix for xklavier api changes


xklavier4.patch:

--- NEW FILE xklavier4.patch ---
diff -up gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xklavier4 gdm-2.26.1/gui/simple-greeter/gdm-layouts.c
--- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xklavier4	2009-07-01 09:47:32.546576916 -0400
+++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c	2009-07-01 09:47:50.848564055 -0400
@@ -52,7 +52,7 @@ init_xkl (void)
                 engine = xkl_engine_get_instance (GDK_DISPLAY ());
                 xkl_engine_backup_names_prop (engine);
                 config_registry = xkl_config_registry_get_instance (engine);
-                xkl_config_registry_load (config_registry);
+                xkl_config_registry_load (config_registry, FALSE);
 
                 initial_config = xkl_config_rec_new ();
                 if (!xkl_config_rec_get_from_backup (initial_config, engine)) {


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -p -r1.472 -r1.473
--- gdm.spec	30 Jun 2009 20:38:13 -0000	1.472
+++ gdm.spec	1 Jul 2009 13:55:22 -0000	1.473
@@ -82,7 +82,7 @@ BuildRequires: libselinux-devel
 BuildRequires: check-devel
 BuildRequires: iso-codes-devel
 BuildRequires: gnome-panel-devel
-BuildRequires: libxklavier-devel
+BuildRequires: libxklavier-devel >= 4.0
 
 Provides: service(graphical-login)
 
@@ -102,6 +102,8 @@ Patch20: polkit1.patch
 # fixed upstream, rh 502778
 Patch22: gdm-2.26.0-fix-lang-regex.patch
 
+Patch35: xklavier4.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -147,6 +149,7 @@ The GDM fingerprint plugin provides func
 %patch19 -p1 -b .multistack
 %patch20 -p1 -b .polkit1
 %patch22 -p1 -b .fix-lang-regex
+%patch35 -p1 -b .xklavier4
 
 %patch99 -p1 -b .fedora-logo