[135871] users/devans/GNOME-3/stable/dports/gnome/gnome-terminal

[devans at macports.org]

Revision: 135871
          https://trac.macports.org/changeset/135871
Author:   devans at macports.org
Date:     2015-05-06 00:03:58 -0700 (Wed, 06 May 2015)
Log Message:
-----------
GNOME-3/stable: gnome-terminal, fix RLIMIT_NOFILE issues that cause gnome-terminal-server to fail on startup, enable debug code.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile	2015-05-06 06:27:58 UTC (rev 135870)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile	2015-05-06 07:03:58 UTC (rev 135871)
@@ -45,7 +45,8 @@
 
 patchfiles          patch-uuid.diff \
                     no-dupfd_cloexec.patch \
-                    patch-src-Makefile.am.diff
+                    patch-src-Makefile.am.diff \
+                    patch-src-server.c.diff
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
@@ -57,6 +58,7 @@
 
 configure.args      --with-gtk=3.0 \
                     --with-nautilus-extension=no \
+                    --enable-debug \
                     --disable-migration \
                     --disable-search-provider \
                     --disable-silent-rules \

Added: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff	2015-05-06 07:03:58 UTC (rev 135871)
@@ -0,0 +1,29 @@
+--- src/server.c.orig	2015-03-31 03:56:28.000000000 -0700
++++ src/server.c	2015-05-05 02:17:22.000000000 -0700
+@@ -29,6 +29,8 @@
+ #include <unistd.h>
+ #include <sys/resource.h>
+ #include <sys/types.h>
++#include <sys/param.h>
++#include <sys/syslimits.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -91,7 +93,7 @@
+   if (pthread_atfork (NULL, NULL, atfork_child_restore_rlimit_nofile) != 0)
+     return FALSE;
+ 
+-  l.rlim_cur = l.rlim_max = sv_rlimit_nofile.rlim_max;
++  l.rlim_cur = l.rlim_max = MIN(OPEN_MAX, sv_rlimit_nofile.rlim_max);
+   if (setrlimit (RLIMIT_NOFILE, &l) < 0)
+     return FALSE;
+ 
+@@ -163,7 +165,7 @@
+   }
+ 
+   if (!increase_rlimit_nofile ()) {
+-    g_printerr ("Failed to increase RLIMIT_NOFILE: %m\n");
++    g_printerr ("Failed to increase RLIMIT_NOFILE: %s\n", strerror(errno));
+   }
+ 
+   /* Now we can create the app */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150506/3444568a/attachment.html>