summaryrefslogtreecommitdiff
path: root/x11/gdm/files/extra-patch-daemon_slave.c
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2007-10-24 23:37:25 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2007-10-24 23:37:25 +0000
commit4acc6fb2a411b291c9c210d82bafe7c62e71c77d (patch)
treebc16420eb52d65511ceb520c00171d219210a473 /x11/gdm/files/extra-patch-daemon_slave.c
parentMark as broken on amd64-7 (and, presumably, sparc64-7). (diff)
Presenting GNOME 2.20.1 and all related works for FreeBSD. The official
GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338
Diffstat (limited to 'x11/gdm/files/extra-patch-daemon_slave.c')
-rw-r--r--x11/gdm/files/extra-patch-daemon_slave.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
index 2d609cf2faec..b493dcd80ad9 100644
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -1,6 +1,6 @@
---- daemon/slave.c.orig Sat Oct 28 22:38:51 2006
-+++ daemon/slave.c Tue Oct 31 12:33:41 2006
-@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_
+--- daemon/slave.c.orig 2007-09-17 10:45:50.000000000 -0400
++++ daemon/slave.c 2007-09-25 13:42:06.000000000 -0400
+@@ -373,8 +373,7 @@
break;
}
@@ -10,17 +10,17 @@
continue;
/* write until we succeed in writing something */
-@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
- }
+@@ -397,13 +396,6 @@
d->xsession_errors_bytes += r;
--
+
- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
- ! got_xfsz_signal) {
- VE_IGNORE_EINTR (write (d->xsession_errors_fd,
-- "\n...Too much output, ignoring rest...\n",
-- strlen ("\n...Too much output, ignoring rest...\n")));
+- "\n...Too much output, ignoring rest...\n",
+- strlen ("\n...Too much output, ignoring rest...\n")));
- }
-
+-
/* there wasn't more then buf available, so no need to try reading
* again, unless we really want to */
+ if (r < sizeof (buf) && ! read_until_eof)