From 68d13c1a288b344db106c87226cc06b31aaf8898 Mon Sep 17 00:00:00 2001 From: kwm Date: Sun, 17 Jan 2010 12:31:16 +0000 Subject: Update to 2.29.5. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13479 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gdm/Makefile | 7 +- x11/gdm/distinfo | 6 +- x11/gdm/files/patch-common_gdm-address.c | 22 +--- ...ch-gui_simple-chooser_gdm-host-chooser-widget.c | 17 +-- .../files/patch-gui_simple-greeter_gdm-languages.c | 30 ++--- x11/gdm/files/patch-hal-keyboard | 125 --------------------- x11/gdm/pkg-plist | 2 +- 7 files changed, 20 insertions(+), 189 deletions(-) delete mode 100644 x11/gdm/files/patch-hal-keyboard (limited to 'x11/gdm') diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index c1c0dd02e..b67ae0f27 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.167 2010/01/07 21:34:43 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.168 2010/01/11 13:40:50 kwm Exp $ # PORTNAME= gdm -PORTVERSION= 2.29.4 -PORTREVISION= 2 +PORTVERSION= 2.29.5 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -41,7 +40,7 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier gconf2 libglade2 librsvg2 \ +USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 843dd897d..daa1bbb5a 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.29.4.tar.bz2) = 70c6a4ea694662cf8d5da8b82c4e6cff -SHA256 (gnome2/gdm-2.29.4.tar.bz2) = cb0b2a7d8c832afb275a3a4c95b91097f18e9e2c0acc6bdbaa63ec466507c320 -SIZE (gnome2/gdm-2.29.4.tar.bz2) = 2360981 +MD5 (gnome2/gdm-2.29.5.tar.bz2) = da1ae7b7193c895dad617d2f99a90dc1 +SHA256 (gnome2/gdm-2.29.5.tar.bz2) = 7be227816e2a66fa6ee7f13cdbf7a5ad411632f56f5808c71b897798c4e990c3 +SIZE (gnome2/gdm-2.29.5.tar.bz2) = 2361557 diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c index a827d4b6d..9a4e620ba 100644 --- a/x11/gdm/files/patch-common_gdm-address.c +++ b/x11/gdm/files/patch-common_gdm-address.c @@ -1,5 +1,5 @@ ---- common/gdm-address.c.orig 2009-02-19 21:45:13.000000000 -0500 -+++ common/gdm-address.c 2009-05-11 02:38:17.000000000 -0400 +--- common/gdm-address.c.orig 2010-01-13 17:32:59.000000000 +0000 ++++ common/gdm-address.c 2010-01-17 12:55:48.000000000 +0000 @@ -29,6 +29,8 @@ #include #endif @@ -25,21 +25,3 @@ #include -@@ -206,7 +208,7 @@ gdm_address_get_hostname (GdmAddress *ad - - host [0] = '\0'; - res = getnameinfo ((const struct sockaddr *)address->ss, -- sizeof (struct sockaddr_storage), -+ gdm_sockaddr_len (address->ss), - host, sizeof (host), - NULL, 0, - 0); -@@ -245,7 +247,7 @@ gdm_address_get_numeric_info (GdmAddress - host [0] = '\0'; - serv [0] = '\0'; - res = getnameinfo ((const struct sockaddr *)address->ss, -- sizeof (struct sockaddr_storage), -+ gdm_sockaddr_len (address->ss), - host, sizeof (host), - serv, sizeof (serv), - NI_NUMERICHOST | NI_NUMERICSERV); diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c index dc9a766fa..b7ed32318 100644 --- a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c +++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c @@ -1,20 +1,11 @@ ---- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2009-12-21 17:36:30.000000000 +0100 -+++ gui/simple-chooser/gdm-host-chooser-widget.c 2009-12-26 23:31:52.000000000 +0100 -@@ -443,7 +443,7 @@ find_broadcast_addresses (GdmHostChooser - /* paranoia */ - ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0'; - -- if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) { -+ if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) { - g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name); - } - +--- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2010-01-13 14:29:00.000000000 +0000 ++++ gui/simple-chooser/gdm-host-chooser-widget.c 2010-01-17 13:04:14.000000000 +0000 @@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget #ifdef ENABLE_IPV6 widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0); if (widget->priv->socket_fd != -1) { -+ int off = 0; -+ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)); ++ int off = 0; ++ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)); widget->priv->have_ipv6 = TRUE; } #endif 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 83a029a19..cd8a0f496 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c @@ -1,27 +1,11 @@ ---- 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; - } - -- if (*codesetp != NULL) { -+/* if (*codesetp != NULL) { - char *codeset; - - codeset = normalize_codeset (*codesetp); - g_free (*codesetp); - *codesetp = codeset; -- } -+ }*/ - } - - if (modifierp != NULL) { -@@ -352,7 +352,7 @@ add_locale (const char *language_name) - if (language_name_is_utf8 (language_name)) { +--- gui/simple-greeter/gdm-languages.c.orig 2010-01-13 16:20:08.000000000 +0000 ++++ gui/simple-greeter/gdm-languages.c 2010-01-17 13:10:50.000000000 +0000 +@@ -365,7 +365,7 @@ add_locale (const char *language_name, + if (is_utf8) { name = g_strdup (language_name); - } else { + } else if (utf8_only) { - name = g_strdup_printf ("%s.utf8", language_name); + name = g_strdup_printf ("%s.UTF-8", language_name); - if (!language_name_is_utf8 (name)) { - g_free (name); + language_name_get_codeset_details (name, NULL, &is_utf8); + if (is_utf8) { diff --git a/x11/gdm/files/patch-hal-keyboard b/x11/gdm/files/patch-hal-keyboard deleted file mode 100644 index e68a4aa2c..000000000 --- a/x11/gdm/files/patch-hal-keyboard +++ /dev/null @@ -1,125 +0,0 @@ -Patch from https://bugzilla.gnome.org/show_bug.cgi?id=572765 - ---- daemon/gdm-session-direct.c.orig 2010-01-02 20:41:23.000000000 +0100 -+++ daemon/gdm-session-direct.c 2010-01-02 20:41:31.000000000 +0100 -@@ -45,6 +45,8 @@ - #include - #include - -+#include -+ - #include "gdm-session-direct.h" - #include "gdm-session.h" - #include "gdm-session-private.h" -@@ -595,14 +597,85 @@ get_default_language_name (GdmSessionDir - return setlocale (LC_MESSAGES, NULL); - } - -+static char * -+get_system_default_layout (GdmSessionDirect *session) -+{ -+ DBusConnection *connection; -+ LibHalContext *ctx; -+ char **devices; -+ int n_devices; -+ char *layout; -+ char *variant; -+ char *result; -+ -+ result = NULL; -+ -+ connection = dbus_g_connection_get_connection (session->priv->connection); -+ ctx = libhal_ctx_new (); -+ libhal_ctx_set_dbus_connection (ctx, connection); -+ -+ if (!libhal_ctx_init (ctx, NULL)) { -+ goto out; -+ } -+ -+ devices = libhal_find_device_by_capability (ctx, -+ "input.keyboard", -+ &n_devices, -+ NULL); -+ if (n_devices > 0) { -+ layout = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.x11_options.XkbLayout", -+ NULL); -+ if (!layout) { -+ layout = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.xkb.layout", -+ NULL); -+ } -+ -+ 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); -+ -+ libhal_ctx_shutdown (ctx, NULL); -+ libhal_ctx_free (ctx); -+ -+out: -+ if (!result) { -+ result = g_strdup ("us"); -+ } -+ -+ return result; -+} -+ - static const char * - get_default_layout_name (GdmSessionDirect *session) - { -- if (session->priv->saved_layout != NULL) { -- return session->priv->saved_layout; -+ if (!session->priv->saved_layout) { -+ session->priv->saved_layout = get_system_default_layout (session); - } - -- return "us"; -+ return session->priv->saved_layout; - } - - static char * -@@ -1933,8 +2006,8 @@ setup_session_environment (GdmSessionDir - "GDM_LANG", - get_language_name (session)); - -- 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 2010-01-02 20:40:37.000000000 +0100 -+++ daemon/gdm-session-settings.c 2010-01-02 20:40:42.000000000 +0100 -@@ -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"); - } diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index f338e6928..cdb79a748 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -38,7 +38,7 @@ sbin/gdm-stop %%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop %%DATADIR%%/gconf.path %%DATADIR%%/gdb-cmd -%%DATADIR%%/gdm-greeter-login-window.glade +%%DATADIR%%/gdm-greeter-login-window.ui %%DATADIR%%/session-setup.entries share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml share/gnome/help/gdm/C/gdm.xml -- cgit v1.2.3