summaryrefslogtreecommitdiffstats
path: root/x11/gdm/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-12-15 03:42:17 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-12-15 03:42:17 +0800
commita0eb904282d225dbfd4e7d0ec0030d7be8f34458 (patch)
tree25d6b4ffdda969cbb7f89fc0443cc26aa5d424b3 /x11/gdm/files
parent6035ef959bc805c19c658f7394933b000dddcb3f (diff)
downloadmarcuscom-ports-a0eb904282d225dbfd4e7d0ec0030d7be8f34458.tar
marcuscom-ports-a0eb904282d225dbfd4e7d0ec0030d7be8f34458.tar.gz
marcuscom-ports-a0eb904282d225dbfd4e7d0ec0030d7be8f34458.tar.bz2
marcuscom-ports-a0eb904282d225dbfd4e7d0ec0030d7be8f34458.tar.lz
marcuscom-ports-a0eb904282d225dbfd4e7d0ec0030d7be8f34458.tar.xz
marcuscom-ports-a0eb904282d225dbfd4e7d0ec0030d7be8f34458.tar.zst
marcuscom-ports-a0eb904282d225dbfd4e7d0ec0030d7be8f34458.zip
Update to 2.13.0.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5284 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files')
-rw-r--r--x11/gdm/files/patch-daemon_getvt.c64
-rw-r--r--x11/gdm/files/patch-gui_gdmchooser.c19
2 files changed, 0 insertions, 83 deletions
diff --git a/x11/gdm/files/patch-daemon_getvt.c b/x11/gdm/files/patch-daemon_getvt.c
deleted file mode 100644
index 44eb9c198..000000000
--- a/x11/gdm/files/patch-daemon_getvt.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- daemon/getvt.c.orig Mon Nov 14 22:20:51 2005
-+++ daemon/getvt.c Mon Nov 14 22:40:39 2005
-@@ -87,8 +87,10 @@ get_free_vt (int *vtfd)
- {
- int fd, fdv;
- int vtno;
-+#if defined(__linux__)
- unsigned short vtmask;
- struct vt_stat vtstat;
-+#endif
-
- *vtfd = -1;
-
-@@ -103,23 +105,50 @@ get_free_vt (int *vtfd)
- if (fd < 0)
- return -1;
-
-+#if defined(__linux__)
- if (ioctl (fd, VT_GETSTATE, &vtstat) < 0) {
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
-+ if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) {
-+#endif
- VE_IGNORE_EINTR (close (fd));
- return -1;
- }
-
-+#if defined(__linux__)
- for (vtno = gdm_get_value_int (GDM_KEY_FIRST_VT), vtmask = 1 << (vtno-1);
- vtstat.v_state & vtmask; vtno++, vtmask <<= 1);
- if (!vtmask) {
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
-+ fdv = open_vt(vtno);
-+ if (fdv < 0) {
-+#endif
- VE_IGNORE_EINTR (close (fd));
- return -1;
- }
-
-+#if defined(__linux__)
- fdv = open_vt (vtno);
- if (fdv < 0) {
- VE_IGNORE_EINTR (close (fd));
- return -1;
- }
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+ while (vtno < gdm_get_value_int (GDM_KEY_FIRST_VT)) {
-+ if (fdv > -1)
-+ VE_IGNORE_EINTR (close (fdv));
-+
-+ if (ioctl(fd, VT_OPENQRY, &vtno) == -1) {
-+ VE_IGNORE_EINTR (close (fd));
-+ return -1;
-+ }
-+
-+ fdv = open_vt (vtno);
-+ if (fdv < 0) {
-+ VE_IGNORE_EINTR (close (fd));
-+ return -1;
-+ }
-+ }
-+#endif
- *vtfd = fdv;
- return vtno;
- }
diff --git a/x11/gdm/files/patch-gui_gdmchooser.c b/x11/gdm/files/patch-gui_gdmchooser.c
deleted file mode 100644
index b78f9bf20..000000000
--- a/x11/gdm/files/patch-gui_gdmchooser.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gui/gdmchooser.c.orig Sat Jun 11 16:04:13 2005
-+++ gui/gdmchooser.c Sat Jun 11 16:04:35 2005
-@@ -2030,6 +2030,7 @@ main (int argc, char *argv[])
- int nextopt;
- const char *gdm_version;
- int i;
-+ guint sid;
-
- stored_argv = g_new0 (char *, argc + 1);
- for (i = 0; i < argc; i++)
-@@ -2124,7 +2125,7 @@ main (int argc, char *argv[])
- gdm_chooser_xdmcp_init (hosts);
- poptFreeContext (ctx);
-
-- guint sid = g_signal_lookup ("event",
-+ sid = g_signal_lookup ("event",
- GTK_TYPE_WIDGET);
- g_signal_add_emission_hook (sid,
- 0 /* detail */,