diff options
| author | wiz <wiz> | 2005-07-13 13:10:27 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-07-13 13:10:27 +0000 |
| commit | d354c946d9193e8570b3a32fbd7598dd312460f9 (patch) | |
| tree | ac8b6e4c62c40922a709facc0f7940c2ab423189 /x11/gdm/patches | |
| parent | 68618860421ec59851e949d5ec7444e3d784c9c0 (diff) | |
| download | pkgsrc-d354c946d9193e8570b3a32fbd7598dd312460f9.tar.gz | |
DragonFlyBSD support, from Joerg Sonnenberger.
Diffstat (limited to 'x11/gdm/patches')
| -rw-r--r-- | x11/gdm/patches/patch-ai | 60 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-aj | 22 |
2 files changed, 82 insertions, 0 deletions
diff --git a/x11/gdm/patches/patch-ai b/x11/gdm/patches/patch-ai new file mode 100644 index 00000000000..4898547b9b8 --- /dev/null +++ b/x11/gdm/patches/patch-ai @@ -0,0 +1,60 @@ +$NetBSD: patch-ai,v 1.3 2005/07/13 13:10:27 wiz Exp $ + +--- daemon/getvt.c.orig 2005-07-10 09:22:22.000000000 +0000 ++++ daemon/getvt.c +@@ -18,16 +18,16 @@ + extern int GdmFirstVT; + extern gboolean GdmVTAllocation; + +-#if defined (__linux__) || defined (__FreeBSD__) ++#if defined (__linux__) || defined (__FreeBSD__) || defined(__DragonFly__) + + #ifdef __linux__ + #include <sys/vt.h> + #endif +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #include <sys/consio.h> + #endif + +-#ifdef __FreeBSD__ ++#if defined( __FreeBSD__) || defined(__DragonFly__) + static const char* + __itovty(int val) + { +@@ -51,7 +51,7 @@ open_vt (int vtno) + + #if defined (__linux__) + vtname = g_strdup_printf ("/dev/tty%d", vtno); +-#elif defined (__FreeBSD__) ++#elif defined (__FreeBSD__) || defined(__DragonFly__) + vtname = g_strdup_printf ("/dev/ttyv%s", __itovty(vtno - 1)); + #endif + do { +@@ -104,7 +104,7 @@ get_free_vt (int *vtfd) + + #if defined (__linux__) + if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { +-#elif defined (__FreeBSD__) ++#elif defined (__FreeBSD__) || defined(__DragonFly__) + if (ioctl(fd, VT_OPENQRY, &vtno) == -1) { + #endif + vtno = -1; +@@ -177,7 +177,7 @@ gdm_get_cur_vt (void) + { + #if defined (__linux__) + struct vt_stat s; +-#elif defined (__FreeBSD__) ++#elif defined (__FreeBSD__) || defined(__DragonFly__) + int vtno; + #endif + int fd; +@@ -203,7 +203,7 @@ gdm_get_cur_vt (void) + */ + + return s.v_active; +-#elif defined (__FreeBSD__) ++#elif defined (__FreeBSD__) || defined(__DragonFly__) + if (ioctl (fd, VT_GETACTIVE, &vtno) == -1) { + VE_IGNORE_EINTR (close (fd)); + return -1; diff --git a/x11/gdm/patches/patch-aj b/x11/gdm/patches/patch-aj new file mode 100644 index 00000000000..e27af61fcc8 --- /dev/null +++ b/x11/gdm/patches/patch-aj @@ -0,0 +1,22 @@ +$NetBSD: patch-aj,v 1.1 2005/07/13 13:10:27 wiz Exp $ + +--- daemon/gdm.c.orig 2005-07-10 09:24:31.000000000 +0000 ++++ daemon/gdm.c +@@ -4249,7 +4249,7 @@ gdm_handle_user_message (GdmConnection * + return; + } + +-#if defined(__linux__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) + gdm_connection_printf (conn, "OK %d\n", gdm_get_cur_vt ()); + #else + gdm_connection_write (conn, "ERROR 8 Virtual terminals not supported\n"); +@@ -4275,7 +4275,7 @@ gdm_handle_user_message (GdmConnection * + return; + } + +-#if defined(__linux__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) + gdm_change_vt (vt); + for (li = displays; li != NULL; li = li->next) { + GdmDisplay *disp = li->data; |