diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-19 00:36:35 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-19 00:36:35 +0000 |
| commit | f658afc5e1983e283b736001015e02d6775fbbdf (patch) | |
| tree | d3ff8a60374515375ab13847d502d0f1c2e47e6c /x11/gdm | |
| parent | - Update to 0.9.93 (diff) | |
Update to 2.8.0.6.
Notes
Notes:
svn path=/head/; revision=148756
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 3 | ||||
| -rw-r--r-- | x11/gdm/distinfo | 5 | ||||
| -rw-r--r-- | x11/gdm/files/patch-daemon_getvt.c | 64 |
3 files changed, 68 insertions, 4 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 6f7a5dc64c87..b5cdb04daa01 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gdm -PORTVERSION= 2.8.0.5 -PORTREVISION= 1 +PORTVERSION= 2.8.0.6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 25f7c9cd1d5f..c419cf03afc7 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,2 +1,3 @@ -MD5 (gnome2/gdm-2.8.0.5.tar.bz2) = 2944ba9c2a2bf7032ac81dc24eecf32d -SIZE (gnome2/gdm-2.8.0.5.tar.bz2) = 2758902 +MD5 (gnome2/gdm-2.8.0.6.tar.bz2) = 6be27ec9f4783abaf1e087e3020e74fa +SHA256 (gnome2/gdm-2.8.0.6.tar.bz2) = 4244787174b9bbab4916e12fed444ce5f612e367b9e2592105889b1146c1bbd2 +SIZE (gnome2/gdm-2.8.0.6.tar.bz2) = 2778293 diff --git a/x11/gdm/files/patch-daemon_getvt.c b/x11/gdm/files/patch-daemon_getvt.c new file mode 100644 index 000000000000..b5ab71be6550 --- /dev/null +++ b/x11/gdm/files/patch-daemon_getvt.c @@ -0,0 +1,64 @@ +--- 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 = GdmFirstVT, 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 < GdmFirstVT) { ++ 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; + } |