diff options
| author | marcus <marcus@FreeBSD.org> | 2007-03-22 05:25:51 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2007-03-22 05:25:51 +0800 |
| commit | e9a7eace0b7c34bcadb5e4ec0c585f0158e6bfbb (patch) | |
| tree | 1d60456066e4750469eff6dceb1e47f1d82821d9 /x11 | |
| parent | 604977e3e6d62b304526dd29a6ba61d31a2c46a3 (diff) | |
| download | freebsd-ports-gnome-e9a7eace0b7c34bcadb5e4ec0c585f0158e6bfbb.tar.gz freebsd-ports-gnome-e9a7eace0b7c34bcadb5e4ec0c585f0158e6bfbb.tar.zst freebsd-ports-gnome-e9a7eace0b7c34bcadb5e4ec0c585f0158e6bfbb.zip | |
We no longer need to read the PID twice now that dbus has been fixed.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-session/Makefile | 2 | ||||
| -rw-r--r-- | x11/gnome-session/files/patch-gnome-session_gsm-dbus.c | 35 |
2 files changed, 1 insertions, 36 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index bc1e84017e0b..0d18d2cfbfbd 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-session PORTVERSION= 2.18.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://www.marcuscom.com/downloads/:local diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c b/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c deleted file mode 100644 index 76de78b45ffe..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c +++ /dev/null @@ -1,35 +0,0 @@ ---- gnome-session/gsm-dbus.c.orig Mon Jan 8 17:32:28 2007 -+++ gnome-session/gsm-dbus.c Thu Jan 11 13:17:41 2007 -@@ -281,6 +281,7 @@ start_parent (int address_fd, int pid_fd - 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 - /* - * 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); -- -- g_printerr ("Failed to get dbus-daemon's pid\n"); -- return; -+ 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; -+ } - } - - close (address_fd); |