Mon Sep 5 13:37:24 UTC 2011

2 files changed, 0 insertions, 166 deletions

diff --git a/gnome-unstable/gdm/2.91_fix_external_program_directories.patch b/gnome-unstable/gdm/2.91_fix_external_program_directories.patch
deleted file mode 100644
index 912b5cdae..000000000
--- a/gnome-unstable/gdm/2.91_fix_external_program_directories.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur gdm-2.91.91.orig/daemon/gdm-server.c gdm-2.91.91/daemon/gdm-server.c
---- gdm-2.91.91.orig/daemon/gdm-server.c	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/daemon/gdm-server.c	2011-02-27 16:56:51.283347074 -0800
-@@ -131,7 +131,7 @@
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
---- gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-02-26 08:43:28.700009251 -0800
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
- _Name=GNOME Settings Daemon
--TryExec=@LIBEXECDIR@/gnome-settings-daemon
--Exec=@LIBEXECDIR@/gnome-settings-daemon
-+TryExec=/usr/bin/gnome-settings-daemon
-+Exec=/usr/bin/gnome-settings-daemon
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-Autostart-Notify=true
-diff -Nur gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
---- gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-02-26 08:44:06.810009153 -0800
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- Type=Application
- _Name=PolicyKit Authentication Agent
--Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
-+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
- OnlyShowIn=GNOME;
-diff -Nur gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c
---- gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c	2011-02-26 08:45:01.946675918 -0800
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+        g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch b/gnome-unstable/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;