summaryrefslogtreecommitdiffstats
path: root/x11/gdm/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-11-01 01:36:14 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-11-01 01:36:14 +0800
commit02891c68b8e1177d7e1aca33154f9868bb13076e (patch)
treef7df9e88d2e4805fc3990a618bc0818765f8f695 /x11/gdm/files
parent4078a047623e22cbeb00ebca36e5f81ddbf8500a (diff)
downloadmarcuscom-ports-02891c68b8e1177d7e1aca33154f9868bb13076e.tar
marcuscom-ports-02891c68b8e1177d7e1aca33154f9868bb13076e.tar.gz
marcuscom-ports-02891c68b8e1177d7e1aca33154f9868bb13076e.tar.bz2
marcuscom-ports-02891c68b8e1177d7e1aca33154f9868bb13076e.tar.lz
marcuscom-ports-02891c68b8e1177d7e1aca33154f9868bb13076e.tar.xz
marcuscom-ports-02891c68b8e1177d7e1aca33154f9868bb13076e.tar.zst
marcuscom-ports-02891c68b8e1177d7e1aca33154f9868bb13076e.zip
- Allow to lift the annoying ~/.xsession-errors size limit
- Start gdm if gnome_enable is set to yes in /etc/rc.conf Obtained from: FreeBSD ports tree git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7849 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files')
-rw-r--r--x11/gdm/files/extra-patch-daemon_slave.c26
-rw-r--r--x11/gdm/files/gdm.in7
2 files changed, 30 insertions, 3 deletions
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
new file mode 100644
index 000000000..2d609cf2f
--- /dev/null
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -0,0 +1,26 @@
+--- 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_
+ break;
+ }
+
+- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES ||
+- got_xfsz_signal)
++ if G_UNLIKELY (got_xfsz_signal)
+ continue;
+
+ /* write until we succeed in writing something */
+@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
+ }
+
+ 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")));
+- }
+
+ /* there wasn't more then buf available, so no need to try reading
+ * again, unless we really want to */
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 6dab74433..a28fdf6b9 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD: ports/x11/gdm/files/gdm.in,v 1.2 2006/10/14 08:35:24 marcus Exp $
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.8 2006/10/10 20:22:24 mezz Exp $
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.10 2006/10/19 01:23:27 marcus Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused
@@ -10,9 +10,10 @@
# gdm_enable="YES"
#
-gdm_enable=${gdm_enable-"NO"}
-
. %%RC_SUBR%%
+. %%GNOME_SUBR%%
+
+gdm_enable=${gdm_enable-${gnome_enable}}
name=gdm
rcvar=`set_rcvar`