rpms/gdm/F-12 gdm-system-keyboard.patch, 1.4, 1.5 gdm.spec, 1.490, 1.491

Matthias Clasen mclasen at fedoraproject.org
Thu Oct 1 14:20:59 UTC 2009 

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14517

Modified Files:
	gdm-system-keyboard.patch gdm.spec 
Log Message:
Handle keyboard layout variants in the system layout


gdm-system-keyboard.patch:
 configure.ac                |    1 
 daemon/gdm-session-direct.c |   81 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 79 insertions(+), 3 deletions(-)

Index: gdm-system-keyboard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-system-keyboard.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdm-system-keyboard.patch	20 Jul 2009 17:20:51 -0000	1.4
+++ gdm-system-keyboard.patch	1 Oct 2009 14:20:57 -0000	1.5
@@ -1,17 +1,22 @@
-diff -up gdm-2.25.2/configure.ac.system-keyboard gdm-2.25.2/configure.ac
---- gdm-2.25.2/configure.ac.system-keyboard	2009-02-24 22:51:00.058815966 -0500
-+++ gdm-2.25.2/configure.ac	2009-02-24 22:51:00.154816109 -0500
-@@ -69,6 +69,7 @@ AC_SUBST(COMMON_LIBS)
- PKG_CHECK_MODULES(DAEMON,
+#
+# Description: Get default keyboard layout from hal
+# Ubuntu: https://bugs.launchpad.net/bugs/395103
+# Fedora: http://cvs.fedoraproject.org/viewvc//devel/gdm/gdm-system-keyboard.patch?view=markup
+#
+diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/configure.ac gdm-2.28.0.new/configure.ac
+--- gdm-2.28.0/configure.ac	2009-09-21 22:06:40.000000000 +0200
++++ gdm-2.28.0.new/configure.ac	2009-10-01 12:35:50.345762314 +0200
+@@ -70,6 +70,7 @@
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
          gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
+         gio-2.0 >= $GLIB_REQUIRED_VERSION
++        hal
  )
  AC_SUBST(DAEMON_CFLAGS)
  AC_SUBST(DAEMON_LIBS)
-diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemon/gdm-session-direct.c
---- gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard	2008-08-26 15:04:00.000000000 -0400
-+++ gdm-2.25.2/daemon/gdm-session-direct.c	2009-02-24 22:55:02.656566009 -0500
+diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/daemon/gdm-session-direct.c gdm-2.28.0.new/daemon/gdm-session-direct.c
+--- gdm-2.28.0/daemon/gdm-session-direct.c	2009-09-21 22:05:27.000000000 +0200
++++ gdm-2.28.0.new/daemon/gdm-session-direct.c	2009-10-01 12:34:43.000000000 +0200
 @@ -45,6 +45,8 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
@@ -21,7 +26,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
  #include "gdm-session-direct.h"
  #include "gdm-session.h"
  #include "gdm-session-private.h"
-@@ -595,14 +597,66 @@ get_default_language_name (GdmSessionDir
+@@ -598,14 +600,87 @@
      return setlocale (LC_MESSAGES, NULL);
  }
  
@@ -33,6 +38,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
 +    char **devices;
 +    int n_devices;
 +    char *layout;
++    char *variant;
 +    char *result;
 +
 +    result = NULL;
@@ -60,8 +66,27 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
 +                                                        "input.xkb.layout",
 +                                                        NULL);
 +        }
-+       result = g_strdup (layout);
-+       libhal_free_string (layout);
++	if (!layout)
++	    goto out;
++
++        variant = libhal_device_get_property_string (ctx,
++                                                    devices[0],
++                                                    "input.x11_options.XkbVariant",
++                                                    NULL);
++        if (!variant) {
++            variant = libhal_device_get_property_string (ctx,
++                                                        devices[0],
++                                                        "input.xkb.variant",
++                                                        NULL);
++        }
++
++	if (variant) {
++	    result = g_strdup_printf("%s\t%s", layout, variant);
++	    libhal_free_string (variant);
++	} else {
++	    result = g_strdup (layout);
++	}
++	libhal_free_string (layout);
 +    }
 +
 +    libhal_free_string_array (devices);
@@ -74,6 +99,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
 +        result = g_strdup ("us");
 +    }
 +
++    g_debug ("GdmSessionDirect: System default keyboard layout: '%s'", result);
 +    return result;
 +}
 +
@@ -82,7 +108,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
  {
 -    if (session->priv->saved_layout != NULL) {
 -                return session->priv->saved_layout;
-+    if (session->priv->saved_layout == NULL) {
++    if (!session->priv->saved_layout) {
 +        session->priv->saved_layout = get_system_default_layout (session);
      }
  
@@ -91,16 +117,3 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
  }
  
  static char *
-diff -up gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard gdm-2.25.2/daemon/gdm-session-settings.c
---- gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard	2008-08-26 15:04:00.000000000 -0400
-+++ gdm-2.25.2/daemon/gdm-session-settings.c	2009-02-24 22:51:00.158815919 -0500
-@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd
- {
-         g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings));
- 
--        if (settings->priv->layout_name == NULL ||
--            strcmp (settings->priv->layout_name, layout_name) != 0) {
-+        if (g_strcmp0 (settings->priv->layout_name, layout_name) != 0) {
-                 settings->priv->layout_name = g_strdup (layout_name);
-                 g_object_notify (G_OBJECT (settings), "layout-name");
-         }


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -p -r1.490 -r1.491
--- gdm.spec	28 Sep 2009 15:15:16 -0000	1.490
+++ gdm.spec	1 Oct 2009 14:20:57 -0000	1.491
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -100,6 +100,7 @@ Patch4: gdm-2.28.0-use-devicekit-power.p
 
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
+# https://bugzilla.gnome.org/show_bug.cgi?id=572765
 Patch13: gdm-system-keyboard.patch
 
 Patch19: gdm-multistack.patch
@@ -400,6 +401,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.4-5
+- Handle keyboard layout variants
+
 * Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> - 1:2.28.0-4
 - Add cache dir to package manifest

More information about the scm-commits mailing list