diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile index 3d450cb1900..f2e571528bb 100644 --- a/x11/gnome/session/Makefile +++ b/x11/gnome/session/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.46 2008/10/14 12:41:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.47 2008/10/28 13:44:32 ajacoutot Exp $ COMMENT= GNOME session GNOME_PROJECT= gnome-session GNOME_VERSION= 2.20.3 -PKGNAME= ${DISTNAME}p14 +PKGNAME= ${DISTNAME}p15 CATEGORIES= x11 # GPLv2/LGPL diff --git a/x11/gnome/session/patches/patch-gnome-session_gsm-dbus_c b/x11/gnome/session/patches/patch-gnome-session_gsm-dbus_c deleted file mode 100644 index aecb6d2ea41..00000000000 --- a/x11/gnome/session/patches/patch-gnome-session_gsm-dbus_c +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-gnome-session_gsm-dbus_c,v 1.1 2007/05/18 14:11:32 jasper Exp $ ---- gnome-session/gsm-dbus.c.orig Mon Mar 12 20:48:31 2007 -+++ gnome-session/gsm-dbus.c Tue May 15 21:41:08 2007 -@@ -281,6 +281,7 @@ start_parent (int address_fd, int pid_fd, pid_t child) - int exitstat; - unsigned long tmp_num; - ssize_t bytes; -+ int i; - - g_assert (child > 0); - -@@ -326,14 +327,17 @@ start_parent (int address_fd, int pid_fd, pid_t child) - /* - * Fetch dbus-daemon pid. - */ -- bytes = read_line (pid_fd, pid_str, sizeof (pid_str)); -- if (bytes == -1 || bytes == 0) -+ for (i = 0; i < 2; i++) - { -- close (address_fd); -- close (pid_fd); -+ bytes = read_line (pid_fd, pid_str, sizeof (pid_str)); -+ if (bytes == -1 || bytes == 0) -+ { -+ close (address_fd); -+ close (pid_fd); - -- g_printerr ("Failed to get dbus-daemon's pid\n"); -- return; -+ g_printerr ("Failed to get dbus-daemon's pid\n"); -+ return; -+ } - } - - close (address_fd);