fix for xklavier api changes

This commit is contained in:
Matthias Clasen 2009-07-01 13:55:22 +00:00
parent 2e973730d0
commit cb3c344666
2 changed files with 16 additions and 1 deletions

View File

@ -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 functionality necessary to use a fingerprint
%patch19 -p1 -b .multistack
%patch20 -p1 -b .polkit1
%patch22 -p1 -b .fix-lang-regex
%patch35 -p1 -b .xklavier4
%patch99 -p1 -b .fedora-logo

12
xklavier4.patch Normal file
View File

@ -0,0 +1,12 @@
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)) {