r24036 - in /desktop/unstable/gdm3/debian: changelog patches/06_first_vt.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Apr 26 23:12:36 UTC 2010
Author: joss
Date: Mon Apr 26 23:12:35 2010
New Revision: 24036
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24036
Log:
06_first_vt.patch: hopefully fix the VT manager on kfreebsd. With
user switching support, by selecting the correct device.
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/06_first_vt.patch
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=24036&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Mon Apr 26 23:12:35 2010
@@ -9,6 +9,8 @@
This fixes the current build issue and will probably not be enough.
Closes: #579288.
* Add Vcs-* fields.
+ * 06_first_vt.patch: hopefully fix the VT manager on kfreebsd. With
+ user switching support, by selecting the correct device.
-- Josselin Mouette <joss at debian.org> Mon, 26 Apr 2010 23:04:18 +0200
Modified: desktop/unstable/gdm3/debian/patches/06_first_vt.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/06_first_vt.patch?rev=24036&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/06_first_vt.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/06_first_vt.patch [utf-8] Mon Apr 26 23:12:35 2010
@@ -2,8 +2,8 @@
only Linux and FreeBSD.
Index: gdm-2.30.0/common/gdm-settings-keys.h
===================================================================
---- gdm-2.30.0.orig/common/gdm-settings-keys.h 2010-03-29 23:42:03.000000000 +0200
-+++ gdm-2.30.0/common/gdm-settings-keys.h 2010-04-23 18:42:51.171351569 +0200
+--- gdm-2.30.0.orig/common/gdm-settings-keys.h 2010-04-27 01:00:54.515631659 +0200
++++ gdm-2.30.0/common/gdm-settings-keys.h 2010-04-27 01:00:55.835120936 +0200
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
@@ -14,8 +14,8 @@
Index: gdm-2.30.0/daemon/gdm-server.c
===================================================================
---- gdm-2.30.0.orig/daemon/gdm-server.c 2010-03-29 23:42:03.000000000 +0200
-+++ gdm-2.30.0/daemon/gdm-server.c 2010-04-23 19:30:43.834854732 +0200
+--- gdm-2.30.0.orig/daemon/gdm-server.c 2010-04-27 01:00:54.475629298 +0200
++++ gdm-2.30.0/daemon/gdm-server.c 2010-04-27 01:06:37.507620711 +0200
@@ -44,6 +44,9 @@
#include "gdm-common.h"
#include "gdm-signal-handler.h"
@@ -26,7 +26,7 @@
#include "gdm-server.h"
extern char **environ;
-@@ -663,6 +666,203 @@ gdm_server_spawn (GdmServer *server,
+@@ -663,6 +666,201 @@ gdm_server_spawn (GdmServer *server,
return ret;
}
@@ -34,9 +34,11 @@
+#include <sys/stat.h>
+#if defined (__linux__)
+#define GDM_USE_SYS_VT
++#define GDMCONSOLEDEVICE "/dev/tty0"
+#include <sys/vt.h>
-+#elif defined (__FreeBSD__)
++#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+#define GDM_USE_CONSIO_VT
++#define GDMCONSOLEDEVICE "/dev/ttyv0"
+#include <sys/consio.h>
+
+static const char*
@@ -52,9 +54,9 @@
+
+ return next;
+}
-+#endif
-+
-+#define GDMCONSOLEDEVICE "/dev/tty0"
++#else /* __linux__ */
++#error Platform not supported
++#endif
+
+
+static gchar *
@@ -106,7 +108,7 @@
+#if defined (GDM_USE_SYS_VT)
+
+static int
-+get_free_vt_sys (void)
++get_free_vt (void)
+{
+ int fd, fdv;
+ int vtno;
@@ -149,7 +151,7 @@
+#elif defined (GDM_USE_CONSIO_VT)
+
+static int
-+get_free_vt_consio (void)
++get_free_vt (void)
+{
+ int fd, fdv;
+ int vtno;
@@ -215,11 +217,7 @@
+{
+ int vt = -1;
+
-+#if defined (GDM_USE_SYS_VT)
-+ vt = get_free_vt_sys ();
-+#elif defined (GDM_USE_CONSIO_VT)
-+ vt = get_free_vt_consio ();
-+#endif
++ vt = get_free_vt ();
+
+ if (vt < 0)
+ return NULL;
@@ -230,7 +228,7 @@
/**
* gdm_server_start:
* @disp: Pointer to a GdmDisplay structure
-@@ -674,10 +874,14 @@ gboolean
+@@ -674,10 +872,14 @@ gboolean
gdm_server_start (GdmServer *server)
{
gboolean res;
@@ -248,8 +246,8 @@
Index: gdm-2.30.0/data/gdm.schemas.in.in
===================================================================
---- gdm-2.30.0.orig/data/gdm.schemas.in.in 2010-03-29 23:42:03.000000000 +0200
-+++ gdm-2.30.0/data/gdm.schemas.in.in 2010-04-23 18:42:51.171351569 +0200
+--- gdm-2.30.0.orig/data/gdm.schemas.in.in 2010-04-27 01:00:54.443628092 +0200
++++ gdm-2.30.0/data/gdm.schemas.in.in 2010-04-27 01:00:55.839126403 +0200
@@ -47,6 +47,11 @@
<signature>i</signature>
<default>30</default>
More information about the pkg-gnome-commits
mailing list