diff options
| -rw-r--r-- | x11/gdm/Makefile | 3 | ||||
| -rw-r--r-- | x11/gdm/files/patch-common_gdm-settings-direct.c | 21 | ||||
| -rw-r--r-- | x11/gdm/files/patch-common_gdm-settings-keys.h | 10 | ||||
| -rw-r--r-- | x11/gdm/files/patch-daemon-gdm-server.c | 73 | ||||
| -rw-r--r-- | x11/gdm/files/patch-data_gdm.schemas.in.in | 14 |
5 files changed, 2 insertions, 119 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index e76be2c95..885508cb8 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.146 2009/03/15 19:53:15 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.147 2009/03/17 16:53:02 kwm Exp $ # PORTNAME= gdm PORTVERSION= 2.26.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gdm/files/patch-common_gdm-settings-direct.c b/x11/gdm/files/patch-common_gdm-settings-direct.c deleted file mode 100644 index da88eda6c..000000000 --- a/x11/gdm/files/patch-common_gdm-settings-direct.c +++ /dev/null @@ -1,21 +0,0 @@ ---- common/gdm-settings-direct.c.orig 2009-03-15 15:40:14.000000000 -0400 -+++ common/gdm-settings-direct.c 2009-03-15 15:49:10.000000000 -0400 -@@ -38,7 +38,7 @@ - #include "gdm-settings-utils.h" - #include "gdm-settings-direct.h" - --static GHashTable *schemas; -+static GHashTable *schemas = NULL; - static GdmSettings *settings_object; - - static GdmSettingsEntry * -@@ -232,7 +232,8 @@ gdm_settings_direct_init (GdmSettings *s - g_return_val_if_fail (file != NULL, FALSE); - g_return_val_if_fail (root != NULL, FALSE); - -- g_assert (schemas == NULL); -+ if (schemas != NULL) -+ return TRUE; - - if (! gdm_settings_parse_schemas (file, root, &list)) { - g_warning ("Unable to parse schemas"); diff --git a/x11/gdm/files/patch-common_gdm-settings-keys.h b/x11/gdm/files/patch-common_gdm-settings-keys.h deleted file mode 100644 index 06ebc0800..000000000 --- a/x11/gdm/files/patch-common_gdm-settings-keys.h +++ /dev/null @@ -1,10 +0,0 @@ ---- common/gdm-settings-keys.h.orig 2008-02-20 16:27:34.000000000 -0500 -+++ common/gdm-settings-keys.h 2008-02-25 22:23:35.000000000 -0500 -@@ -30,6 +30,7 @@ G_BEGIN_DECLS - #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable" - #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin" - #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay" -+#define GDM_KEY_VT "daemon/VT" - - #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable" - #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending" diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c deleted file mode 100644 index 079c62c66..000000000 --- a/x11/gdm/files/patch-daemon-gdm-server.c +++ /dev/null @@ -1,73 +0,0 @@ ---- daemon/gdm-server.c.orig 2008-03-17 19:11:00.000000000 -0400 -+++ daemon/gdm-server.c 2008-08-25 16:11:10.000000000 -0400 -@@ -44,6 +44,10 @@ - #include "gdm-common.h" - #include "gdm-signal-handler.h" - -+#include "gdm-settings.h" -+#include "gdm-settings-direct.h" -+#include "gdm-settings-keys.h" -+ - #include "gdm-server.h" - - extern char **environ; -@@ -77,6 +81,7 @@ struct GdmServerPrivate - char *parent_display_name; - char *parent_auth_file; - char *chosen_hostname; -+ char *vt; - - guint child_watch_id; - }; -@@ -306,7 +311,7 @@ gdm_server_resolve_command_line (GdmServ - argv[len++] = g_strdup ("tcp"); - } - -- if (vtarg != NULL && ! gotvtarg) { -+ if (vtarg != NULL && ! gotvtarg && strncmp (server->priv->display_name, ":0", 2) == 0) { - argv[len++] = g_strdup (vtarg); - } - -@@ -673,7 +678,7 @@ gdm_server_start (GdmServer *server) - gboolean res; - - /* fork X server process */ -- res = gdm_server_spawn (server, NULL); -+ res = gdm_server_spawn (server, server->priv->vt); - - return res; - } -@@ -925,12 +930,33 @@ static void - gdm_server_init (GdmServer *server) - { - -+ int vt; -+ gboolean has_vt; -+ GdmSettings *settings = NULL; - server->priv = GDM_SERVER_GET_PRIVATE (server); - -+ -+ settings = gdm_settings_new(); -+ if (settings == NULL) { -+ g_assert ("Unable to initialize settings"); -+ } -+ -+ if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) { -+ g_assert ("Unable to initialize settings"); -+ } -+ -+ has_vt = gdm_settings_direct_get_int (GDM_KEY_VT, &vt); -+ -+ g_object_unref (settings); -+ - server->priv->pid = -1; - server->priv->command = g_strdup (X_SERVER " -br -verbose"); - server->priv->log_dir = g_strdup (LOGDIR); - -+ if (has_vt) { -+ server->priv->vt = g_strdup_printf ("vt %d", vt); -+ } -+ - add_ready_handler (server); - } - diff --git a/x11/gdm/files/patch-data_gdm.schemas.in.in b/x11/gdm/files/patch-data_gdm.schemas.in.in deleted file mode 100644 index ae5572ddd..000000000 --- a/x11/gdm/files/patch-data_gdm.schemas.in.in +++ /dev/null @@ -1,14 +0,0 @@ ---- data/gdm.schemas.in.in.orig 2007-12-13 12:14:19.000000000 -0500 -+++ data/gdm.schemas.in.in 2007-12-13 12:15:05.000000000 -0500 -@@ -11,6 +11,11 @@ - <signature>s</signature> - <default>gdm</default> - </schema> -+ <schema> -+ <key>daemon/VT</key> -+ <signature>i</signature> -+ <default>9</default> -+ </schema> - - <schema> - <key>xdmcp/Enable</key> |