packages (HEAD): gdm/gdm.spec, gdm/gdm-libxklavier40.patch (NEW) - add libx...

[patrys]

Author: patrys                       Date: Mon Jun 29 21:06:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add libxklavier patch

---- Files affected:
packages/gdm:
   gdm.spec (1.229.2.6 -> 1.229.2.7) , gdm-libxklavier40.patch (NONE -> 1.2)  (NEW)

---- Diffs:

================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.229.2.6 packages/gdm/gdm.spec:1.229.2.7
--- packages/gdm/gdm.spec:1.229.2.6	Fri Jun  5 16:51:59 2009
+++ packages/gdm/gdm.spec	Mon Jun 29 23:06:37 2009
@@ -34,6 +34,7 @@
 Source3:	%{name}-pld-logo.png
 #Source4:	%{name}-autologin.pamd
 Patch0:		%{name}-xdmcp.patch
+Patch1:		%{name}-libxklavier40.patch
 Patch2:		%{name}-xsession.patch
 Patch4:		%{name}-defaults.patch
 URL:		http://www.gnome.org/projects/gdm/
@@ -144,6 +145,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch4 -p1
 rm -f data/gdm.schemas.in
@@ -289,6 +291,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.229.2.7  2009/06/29 21:06:37  patrys
+- add libxklavier patch
+
 Revision 1.229.2.6  2009/06/05 14:51:59  patrys
 - R: Xorg binary
 

================================================================
Index: packages/gdm/gdm-libxklavier40.patch
diff -u /dev/null packages/gdm/gdm-libxklavier40.patch:1.2
--- /dev/null	Mon Jun 29 23:06:42 2009
+++ packages/gdm/gdm-libxklavier40.patch	Mon Jun 29 23:06:37 2009
@@ -0,0 +1,11 @@
+--- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c~	2009-03-27 15:28:45.000000000 +0100
++++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c	2009-06-29 23:01:14.014597308 +0200
+@@ -52,7 +52,7 @@
+                 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)) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm.spec?r1=1.229.2.6&r2=1.229.2.7&f=u