* Update to 2.28.2.

* Properly add support for reading keyboard invariants from hal. [1]

PR:		141143 [1]
Submitted by:	Andreas Wetzel <mickey242@gmx.net> [1]

5 files changed, 73 insertions, 28 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a7b212ae9724..b618eb75337a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.28.1
-PORTREVISION=	3
+PORTVERSION=	2.28.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index c2b797f0de19..7a19015ef0f2 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.28.1.tar.bz2) = 917dc80f5ef6adcdc15193de238476db
-SHA256 (gnome2/gdm-2.28.1.tar.bz2) = da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a
-SIZE (gnome2/gdm-2.28.1.tar.bz2) = 2332716
+MD5 (gnome2/gdm-2.28.2.tar.bz2) = 9607c6bac31c9d8bd3446e66a4576c2e
+SHA256 (gnome2/gdm-2.28.2.tar.bz2) = 0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a
+SIZE (gnome2/gdm-2.28.2.tar.bz2) = 2283246
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
index fae89ec079d8..e5fb649c66ca 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
@@ -1,34 +1,34 @@
---- gui/simple-greeter/gdm-user.c.orig	2009-07-20 03:09:09.000000000 +0200
-+++ gui/simple-greeter/gdm-user.c	2009-07-20 10:09:41.000000000 +0200
-@@ -427,6 +427,7 @@ _gdm_user_update (GdmUser             *u
+--- gui/simple-greeter/gdm-user.c.orig	2009-12-16 17:52:36.000000000 -0500
++++ gui/simple-greeter/gdm-user.c	2009-12-18 21:43:38.000000000 -0500
+@@ -425,6 +425,7 @@ _gdm_user_update (GdmUser             *u
          /* Display Name */
          if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') {
-                 gchar *first_comma;
-+		gchar *ampersand;
-                 gchar *real_name_utf8;
+                 gchar *first_comma = NULL;
++                gchar *ampersand;
+                 gchar *valid_utf8_name = NULL;
  
-                 real_name_utf8 = g_locale_to_utf8 (pwent->pw_gecos, -1, NULL, NULL, NULL);
-@@ -443,6 +444,23 @@ _gdm_user_update (GdmUser             *u
+                 if (g_utf8_validate (pwent->pw_gecos, -1, NULL)) {
+@@ -449,6 +450,23 @@ _gdm_user_update (GdmUser             *u
                          g_free (real_name);
                          real_name = NULL;
                  }
 +
-+		while (real_name != NULL && (ampersand = strchr (real_name, '&')) != NULL) {
-+			gchar *temp_real_name1;
-+			gchar *temp_real_name2;
-+			gchar *temp_name;
++                while (real_name != NULL && (ampersand = strchr (real_name, '&')) != NULL) {
++                        gchar *temp_real_name1;
++                        gchar *temp_real_name2;
++                        gchar *temp_name;
 +
-+			temp_real_name1 = g_strndup (real_name,
-+					(ampersand - real_name));
-+			temp_real_name2 = g_strdup (ampersand + 1);
-+			temp_name = g_strdup (pwent->pw_name);
-+			temp_name[0] = toupper (temp_name[0]);
-+			g_free (real_name);
-+			real_name = g_strdup_printf ("%s%s%s", temp_real_name1, temp_name, temp_real_name2);
-+			g_free (temp_real_name1);
-+			g_free (temp_real_name2);
-+			g_free (temp_name);
-+		}
++                        temp_real_name1 = g_strndup (real_name,
++                                        (ampersand - real_name));
++                        temp_real_name2 = g_strdup (ampersand + 1);
++                        temp_name = g_strdup (pwent->pw_name);
++                        temp_name[0] = toupper (temp_name[0]);
++                        g_free (real_name);
++                        real_name = g_strdup_printf ("%s%s%s", temp_real_name1, temp_name, temp_real_name2);
++                        g_free (temp_real_name1);
++                        g_free (temp_real_name2);
++                        g_free (temp_name);
++                }
          } else {
                  real_name = NULL;
          }
diff --git a/x11/gdm/files/patch-hal-keyboard.2 b/x11/gdm/files/patch-hal-keyboard.2
new file mode 100644
index 000000000000..a0a84216cc29
--- /dev/null
+++ b/x11/gdm/files/patch-hal-keyboard.2
@@ -0,0 +1,40 @@
+--- daemon/gdm-session-direct.c.orig	2009-12-02 15:15:33.000000000 +0100
++++ daemon/gdm-session-direct.c	2009-12-02 15:15:41.000000000 +0100
+@@ -608,6 +608,7 @@
+     char **devices;
+     int n_devices;
+     char *layout;
++    char *variant;
+     char *result;
+ 
+     result = NULL;
+@@ -635,8 +636,26 @@
+                                                         "input.xkb.layout",
+                                                         NULL);
+         }
+-	result = g_strdup (layout);
++
++	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(layout && variant)
++		result = g_strdup_printf("%s\t%s", layout, variant);
++	else
++		result = g_strdup (layout);
++
+ 	libhal_free_string (layout);
++	libhal_free_string (variant);
+     }
+ 
+     libhal_free_string_array (devices);
+
+
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 95025aa6c2aa..a10f0b9db4ab 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -54,6 +54,7 @@ share/gnome/help/gdm/oc/gdm.xml
 share/gnome/help/gdm/ru/gdm.xml
 share/gnome/help/gdm/sv/gdm.xml
 share/gnome/help/gdm/uk/gdm.xml
+share/gnome/help/gdm/zh_CN/gdm.xml
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
@@ -117,6 +118,7 @@ share/locale/mn/LC_MESSAGES/gdm.mo
 share/locale/mr/LC_MESSAGES/gdm.mo
 share/locale/ms/LC_MESSAGES/gdm.mo
 share/locale/nb/LC_MESSAGES/gdm.mo
+share/locale/nds/LC_MESSAGES/gdm.mo
 share/locale/ne/LC_MESSAGES/gdm.mo
 share/locale/nl/LC_MESSAGES/gdm.mo
 share/locale/nn/LC_MESSAGES/gdm.mo
@@ -164,6 +166,7 @@ share/omf/gdm/gdm-oc.omf
 share/omf/gdm/gdm-ru.omf
 share/omf/gdm/gdm-sv.omf
 share/omf/gdm/gdm-uk.omf
+share/omf/gdm/gdm-zh_CN.omf
 share/pixmaps/faces/astronaut.jpg
 share/pixmaps/faces/baseball.png
 share/pixmaps/faces/butterfly.png
@@ -198,6 +201,7 @@ share/pixmaps/nohost.png
 @dirrmtry share/xsessions
 @dirrm share/pixmaps/faces
 @dirrm share/omf/gdm
+@dirrm share/gnome/help/gdm/zh_CN
 @dirrm share/gnome/help/gdm/uk
 @dirrm share/gnome/help/gdm/sv
 @dirrm share/gnome/help/gdm/ru
@@ -256,6 +260,8 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES