From a0eb904282d225dbfd4e7d0ec0030d7be8f34458 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 14 Dec 2005 19:42:17 +0000 Subject: Update to 2.13.0.3. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5284 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gdm/Makefile | 5 ++- x11/gdm/distinfo | 6 ++-- x11/gdm/files/patch-daemon_getvt.c | 64 ------------------------------------ x11/gdm/files/patch-gui_gdmchooser.c | 19 ----------- 4 files changed, 5 insertions(+), 89 deletions(-) delete mode 100644 x11/gdm/files/patch-daemon_getvt.c delete mode 100644 x11/gdm/files/patch-gui_gdmchooser.c (limited to 'x11') diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 9c143c61e..4b10e3649 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.5 2005/12/04 19:14:21 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.6 2005/12/05 22:00:06 marcus Exp $ # PORTNAME= gdm -PORTVERSION= 2.13.0.1 -PORTREVISION= 3 +PORTVERSION= 2.13.0.3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.13 diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 9e962b7b9..dc42f26af 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.13.0.1.tar.bz2) = d4e665609734cc62db7199a3e35b9300 -SHA256 (gnome2/gdm-2.13.0.1.tar.bz2) = 788689adc986178856faecd451ce1a6206691621892c2acae4254cd870044b02 -SIZE (gnome2/gdm-2.13.0.1.tar.bz2) = 2847181 +MD5 (gnome2/gdm-2.13.0.3.tar.bz2) = 8e568e0ad436470b91010dc19d505e44 +SHA256 (gnome2/gdm-2.13.0.3.tar.bz2) = e4aa57b8c29ceb43c3887cd0d3a2d0793678338fc94ac32d6a2ab173186e24af +SIZE (gnome2/gdm-2.13.0.3.tar.bz2) = 2861747 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 */, -- cgit v1.2.3