Update to 2.27.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12490 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 64 insertions, 93 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 7e539f71f..a12dfdd52 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gdm/Makefile,v 1.8 2009/04/15 23:39:01 kwm Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.150 2009/07/06 21:18:03 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.26.1
-PORTREVISION=	6
+PORTVERSION=	2.27.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index e0eb9e84b..3de1a2662 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.26.1.tar.bz2) = c2c15f8b741962f278fa7e790aaa9a2b
-SHA256 (gnome2/gdm-2.26.1.tar.bz2) = 34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
-SIZE (gnome2/gdm-2.26.1.tar.bz2) = 2526832
+MD5 (gnome2/gdm-2.27.4.tar.bz2) = 82f19b1c68d70638d6f4a6676b1b438e
+SHA256 (gnome2/gdm-2.27.4.tar.bz2) = 17507e91bbea0c34ceb5eca28d25affa7c47069c93601fa83c0fda653d391f67
+SIZE (gnome2/gdm-2.27.4.tar.bz2) = 2505492
diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
index 63fb5db1c..692c27516 100644
--- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
+++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
@@ -1,5 +1,5 @@
---- daemon/gdm-xdmcp-display-factory.c.orig	2009-03-16 16:12:08.000000000 -0400
-+++ daemon/gdm-xdmcp-display-factory.c	2009-05-16 18:17:26.000000000 -0400
+--- daemon/gdm-xdmcp-display-factory.c.orig	2009-07-20 03:09:09.000000000 +0200
++++ daemon/gdm-xdmcp-display-factory.c	2009-07-20 09:54:25.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <netdb.h>
  #include <arpa/inet.h>
@@ -46,7 +46,7 @@
          if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
                  g_warning ("bind: %s", g_strerror (errno));
                  close (sock);
-@@ -833,7 +849,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF
+@@ -835,7 +851,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -55,7 +55,7 @@
  
          g_free (status.data);
  }
-@@ -877,7 +893,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla
+@@ -879,7 +895,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -64,7 +64,7 @@
  
          last_time = time (NULL);
  }
-@@ -986,7 +1002,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi
+@@ -988,7 +1004,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (ic->chosen_address),
@@ -73,7 +73,7 @@
  
          g_free (port.data);
          g_free (addr.data);
-@@ -1689,7 +1705,7 @@ gdm_xdmcp_really_send_managed_forward (G
+@@ -1691,7 +1707,7 @@ gdm_xdmcp_really_send_managed_forward (G
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -82,7 +82,7 @@
  
          g_free (addr.data);
  }
-@@ -1770,7 +1786,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX
+@@ -1772,7 +1788,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -91,7 +91,7 @@
  }
  
  static gboolean
-@@ -1943,7 +1959,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF
+@@ -1945,7 +1961,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -100,7 +100,7 @@
  
          /* Send MANAGED_FORWARD to indicate that the connection
           * reached some sort of resolution */
-@@ -2091,7 +2107,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa
+@@ -2093,7 +2109,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -109,25 +109,7 @@
  
          host = NULL;
          gdm_address_get_numeric_info (address, &host, NULL);
-@@ -2309,8 +2325,6 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla
-                                 authorization_data.data     = (CARD8 *) cookie->data;
-                                 authorization_data.length   = cookie->len;
- 
--                                g_array_free (cookie, TRUE);
--
-                                 /* the addrs are NOT copied */
-                                 gdm_xdmcp_send_accept (factory,
-                                                        address,
-@@ -2319,6 +2333,8 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla
-                                                        &authentication_data,
-                                                        &authorization_name,
-                                                        &authorization_data);
-+
-+                                g_array_free (cookie, TRUE);
-                         }
-                 }
-         } else {
-@@ -2422,7 +2438,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa
+@@ -2424,7 +2440,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -136,7 +118,7 @@
  }
  
  static void
-@@ -2446,7 +2462,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa
+@@ -2448,7 +2464,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -145,7 +127,7 @@
  
          /*
           * This was from a forwarded query quite apparently so
-@@ -2717,7 +2733,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac
+@@ -2719,7 +2735,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac
          XdmcpFlush (factory->priv->socket_fd,
                      &factory->priv->buf,
                      (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
index 9116dc917..675925aa9 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
@@ -1,5 +1,5 @@
---- gui/simple-greeter/gdm-languages.c.orig	2008-11-22 17:16:42.000000000 -0500
-+++ gui/simple-greeter/gdm-languages.c	2008-11-22 17:29:05.000000000 -0500
+--- gui/simple-greeter/gdm-languages.c.orig	2009-07-20 03:09:09.000000000 +0200
++++ gui/simple-greeter/gdm-languages.c	2009-07-20 10:02:41.000000000 +0200
 @@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
                          *codesetp = NULL;
                  }
@@ -16,7 +16,16 @@
          }
  
          if (modifierp != NULL) {
-@@ -353,7 +353,7 @@ add_locale (const char *language_name)
+@@ -314,7 +314,7 @@ language_name_has_translations (const ch
+         const char  *name;
+         gboolean     has_translations;
+ 
+-        path = g_build_filename (GNOMELOCALEDIR, language_name, "LC_MESSAGES", NULL);
++        path = g_build_filename ("/usr/share/locale", language_name, "LC_MESSAGES", NULL);
+ 
+         has_translations = FALSE;
+         dir = g_dir_open (path, 0, NULL);
+@@ -352,7 +352,7 @@ add_locale (const char *language_name)
          if (language_name_is_utf8 (language_name)) {
                  name = g_strdup (language_name);
          } else {
@@ -25,20 +34,11 @@
  
                  if (!language_name_is_utf8 (name)) {
                          g_free (name);
-@@ -482,7 +482,7 @@ select_dirs (const struct dirent *dirent
-                                 struct stat st;
-                                 char       *path;
- 
--                                path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL);
-+                                path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL);
-                                 if (g_stat (path, &st) == 0) {
-                                         mode = st.st_mode;
-                                 }
-@@ -502,7 +502,7 @@ collect_locales_from_directory (void)
+@@ -501,7 +501,7 @@ collect_locales_from_directory (void)
          int             ndirents;
          int             cnt;
  
--        ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort);
+-        ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort);
 +        ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort);
  
          for (cnt = 0; cnt < ndirents; ++cnt) {
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-layouts.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-layouts.c
deleted file mode 100644
index eff888777..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-layouts.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-greeter/gdm-layouts.c.orig	2009-07-06 17:10:45.000000000 -0400
-+++ gui/simple-greeter/gdm-layouts.c	2009-07-06 17:10:58.000000000 -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, TRUE);
- 
-                 initial_config = xkl_config_rec_new ();
-                 if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
index d666bc1fd..aeaa0d29a 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -1,12 +1,11 @@
---- gui/simple-greeter/gdm-user-manager.c.orig	2008-04-29 13:38:43.000000000 -0400
-+++ gui/simple-greeter/gdm-user-manager.c	2008-05-03 13:27:52.000000000 -0400
-@@ -1269,17 +1269,23 @@ reload_passwd (GdmUserManager *manager)
-         GSList        *old_users;
+--- gui/simple-greeter/gdm-user-manager.c.orig	2009-07-20 03:09:09.000000000 +0200
++++ gui/simple-greeter/gdm-user-manager.c	2009-07-20 10:07:37.000000000 +0200
+@@ -1303,17 +1303,24 @@ reload_passwd (GdmUserManager *manager)
          GSList        *new_users;
          GSList        *list;
--        FILE          *fp;
+         GSList        *dup;
 +#ifndef __FreeBSD__
-+       FILE          *fp;
+         FILE          *fp;
 +#endif
  
          old_users = NULL;
@@ -15,6 +14,7 @@
 +#ifdef __FreeBSD__
 +        setpwent ();
 +#else
++
          errno = 0;
          fp = fopen (PATH_PASSWD, "r");
          if (fp == NULL) {
@@ -25,7 +25,7 @@
  
          g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
          g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
-@@ -1292,7 +1298,11 @@ reload_passwd (GdmUserManager *manager)
+@@ -1327,7 +1334,11 @@ reload_passwd (GdmUserManager *manager)
                  }
          }
  
@@ -37,7 +37,7 @@
                  GdmUser *user;
  
                  user = NULL;
-@@ -1355,7 +1365,11 @@ reload_passwd (GdmUserManager *manager)
+@@ -1398,7 +1409,11 @@ reload_passwd (GdmUserManager *manager)
   out:
          /* Cleanup */
  
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 049b75b42..fae89ec07 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
@@ -1,14 +1,14 @@
---- gui/simple-greeter/gdm-user.c.orig	2009-05-16 17:52:57.000000000 -0400
-+++ gui/simple-greeter/gdm-user.c	2009-05-16 18:08:08.000000000 -0400
-@@ -412,6 +412,7 @@ _gdm_user_update (GdmUser             *u
+--- 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
          /* Display Name */
          if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') {
                  gchar *first_comma;
 +		gchar *ampersand;
+                 gchar *real_name_utf8;
  
-                 first_comma = strchr (pwent->pw_gecos, ',');
-                 if (first_comma) {
-@@ -425,6 +426,23 @@ _gdm_user_update (GdmUser             *u
+                 real_name_utf8 = g_locale_to_utf8 (pwent->pw_gecos, -1, NULL, NULL, NULL);
+@@ -443,6 +444,23 @@ _gdm_user_update (GdmUser             *u
                          g_free (real_name);
                          real_name = NULL;
                  }
diff --git a/x11/gdm/files/patch-hal-keyboard b/x11/gdm/files/patch-hal-keyboard
index a712f04a1..904f1cdac 100644
--- a/x11/gdm/files/patch-hal-keyboard
+++ b/x11/gdm/files/patch-hal-keyboard
@@ -1,6 +1,5 @@
-diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemon/gdm-session-direct.c
---- daemon/gdm-session-direct.c.system-keyboard	2008-08-26 15:04:00.000000000 -0400
-+++ daemon/gdm-session-direct.c	2009-02-24 22:55:02.656566009 -0500
+--- daemon/gdm-session-direct.c.orig	2009-07-20 03:09:09.000000000 +0200
++++ daemon/gdm-session-direct.c	2009-07-20 10:14:45.000000000 +0200
 @@ -45,6 +45,8 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
@@ -10,7 +9,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemo
  #include "gdm-session-direct.h"
  #include "gdm-session.h"
  #include "gdm-session-private.h"
-@@ -595,14 +597,66 @@ get_default_language_name (GdmSessionDir
+@@ -597,14 +599,66 @@ get_default_language_name (GdmSessionDir
      return setlocale (LC_MESSAGES, NULL);
  }
  
@@ -80,23 +79,19 @@ diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemo
  }
  
  static char *
-@@ -1971,9 +2025,10 @@ setup_session_environment (GdmSessionDir
+@@ -1953,8 +2007,8 @@ setup_session_environment (GdmSessionDir
                                                       "GDM_LANG",
                                                       get_language_name (session));
  
--        gdm_session_direct_set_environment_variable (session,
--                                                     "GDM_KEYBOARD_LAYOUT",
--                                                     get_layout_name (session));
-+	if (g_strcmp0 (get_layout_name (session), get_system_default_layout (session)) != 0)
-+        	gdm_session_direct_set_environment_variable (session,
-+                                                     	     "GDM_KEYBOARD_LAYOUT",
-+                                                             get_layout_name (session));
- 
-         gdm_session_direct_set_environment_variable (session,
-                                                      "DISPLAY",
-diff -up gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard gdm-2.25.2/daemon/gdm-session-settings.c
---- daemon/gdm-session-settings.c.system-keyboard	2008-08-26 15:04:00.000000000 -0400
-+++ daemon/gdm-session-settings.c	2009-02-24 22:51:00.158815919 -0500
+-        if (strcmp (get_layout_name (session),
+-                    get_default_layout_name (session)) == 0) {
++        if (g_strcmp0 (get_layout_name (session),
++                    get_default_layout_name (session)) != 0) {
+                 gdm_session_direct_set_environment_variable (session,
+                                                              "GDM_KEYBOARD_LAYOUT",
+                                                              get_layout_name (session));
+--- daemon/gdm-session-settings.c.orig	2009-05-19 17:18:12.000000000 +0200
++++ daemon/gdm-session-settings.c	2009-07-20 10:10:15.000000000 +0200
 @@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd
  {
          g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings));
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index cfe404abd..04c078964 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -43,6 +43,7 @@ share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 share/gnome/help/gdm/C/gdm.xml
 share/gnome/help/gdm/C/legal.xml
 share/gnome/help/gdm/de/gdm.xml
+share/gnome/help/gdm/el/gdm.xml
 share/gnome/help/gdm/en_GB/gdm.xml
 share/gnome/help/gdm/es/gdm.xml
 share/gnome/help/gdm/fr/gdm.xml
@@ -97,6 +98,7 @@ share/locale/is/LC_MESSAGES/gdm.mo
 share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
 share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kk/LC_MESSAGES/gdm.mo
 share/locale/kn/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
@@ -148,6 +150,7 @@ share/locale/zh_TW/LC_MESSAGES/gdm.mo
 share/locale/zu/LC_MESSAGES/gdm.mo
 share/omf/gdm/gdm-C.omf
 share/omf/gdm/gdm-de.omf
+share/omf/gdm/gdm-el.omf
 share/omf/gdm/gdm-en_GB.omf
 share/omf/gdm/gdm-es.omf
 share/omf/gdm/gdm-fr.omf
@@ -200,6 +203,7 @@ share/pixmaps/nohost.png
 @dirrm share/gnome/help/gdm/fr
 @dirrm share/gnome/help/gdm/es
 @dirrm share/gnome/help/gdm/en_GB
+@dirrm share/gnome/help/gdm/el
 @dirrm share/gnome/help/gdm/de
 @dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/help/gdm
@@ -256,6 +260,8 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/fur/LC_MESSAGES