rpms/gdm/F-11 gdm-xkb-init.patch,NONE,1.1 gdm.spec,1.468,1.469
Matthias Clasen
mclasen at fedoraproject.org
Thu Apr 30 02:14:03 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22462
Modified Files:
gdm.spec
Added Files:
gdm-xkb-init.patch
Log Message:
Don't rely on _BACKUP property for xkb initialization
gdm-xkb-init.patch:
--- NEW FILE gdm-xkb-init.patch ---
diff -up gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xkb-init gdm-2.26.1/gui/simple-greeter/gdm-layouts.c
--- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xkb-init 2009-04-29 21:27:20.129995831 -0400
+++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c 2009-04-29 21:28:12.378737969 -0400
@@ -55,9 +55,9 @@ init_xkl (void)
xkl_config_registry_load (config_registry);
initial_config = xkl_config_rec_new ();
- if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
+ if (!xkl_config_rec_get_from_server (initial_config, engine)) {
g_warning ("failed to load XKB configuration");
- initial_config->model = g_strdup ("pc105");
+ initial_config->model = g_strdup ("evdev");
}
}
}
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- gdm.spec 29 Apr 2009 00:20:19 -0000 1.468
+++ gdm.spec 30 Apr 2009 02:13:33 -0000 1.469
@@ -16,7 +16,7 @@
Summary: The GNOME Display Manager
Name: gdm
Version: 2.26.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
@@ -92,9 +92,8 @@ Requires: audit-libs >= %{libauditver}
Patch2: gdm-2.26.0-force-active-vt.patch
Patch3: gdm-2.23.92-save-root-window.patch
-# uses /etc/sysconfig/keyboard and is thus not directly upstreamable
-# should probably be changed to get the system layout from the X server
Patch13: gdm-system-keyboard.patch
+Patch14: gdm-xkb-init.patch
Patch19: gdm-2.26.1-multistack.patch
@@ -143,6 +142,7 @@ The GDM fingerprint plugin provides func
%patch2 -p1 -b .force-active-vt
%patch3 -p1 -b .save-root-window
%patch13 -p1 -b .system-keyboard
+%patch14 -p1 -b .xkb-init
%patch19 -p1 -b .multistack
@@ -390,6 +390,9 @@ fi
%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
%changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-7
+- Don't rely on _BACKUP property for xkb initialization
+
* Tue Apr 28 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-6
- fix a use-after-free in XDMCP code paths (#496882)
More information about the fedora-extras-commits
mailing list