<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118925] trunk/dports/gnome/gnome-terminal</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118925">118925</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-04-13 18:58:20 -0700 (Sun, 13 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-terminal: update to version 3.12.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnometerminalPortfile">trunk/dports/gnome/gnome-terminal/Portfile</a></li>
<li><a href="#trunkdportsgnomegnometerminalfilesnodupfd_cloexecpatch">trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch</a></li>
<li><a href="#trunkdportsgnomegnometerminalfilespatchuuiddiff">trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnometerminalfilespatchgetcwddiff">trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegnometerminal">trunk/dports/gnome/gnome-terminal/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnometerminal"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gnome-terminal</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-terminal:108269-113174
</span><span class="cx">/users/rmstonecipher/gnome/gnome-terminal:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-terminal:108269-118732
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154
</span><span class="cx">/users/rmstonecipher/gnome/gnome-terminal:102363-103172
</span><a id="trunkdportsgnomegnometerminalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-terminal/Portfile (118924 => 118925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/Portfile 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2014-04-14 01:58:20 UTC (rev 118925)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-terminal
</span><del>-version 3.10.2
</del><ins>+version 3.12.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><del>-description Terminal component for the GNOME 2 Desktop
</del><ins>+description Terminal component for the GNOME 3 Desktop
</ins><span class="cx"> long_description \
</span><span class="cx"> ${description}
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 b25d2782052cf65f7b8b4dc591762cf69e21f630 \
- sha256 e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913
</del><ins>+checksums rmd160 149a4da5c39370838a85a1d3fb2b487ab5adc3a3 \
+ sha256 ce690ed798a3e940f2f3a173a7946181e48d899214048d3282c671535c87cea7
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> port:gsettings-desktop-schemas \
</span><span class="cx"> port:gtk3 \
</span><span class="cx"> port:vte \
</span><ins>+ port:appdata-tools \
</ins><span class="cx"> port:dbus \
</span><span class="cx"> port:dconf \
</span><span class="cx"> port:xorg-libX11
</span><span class="lines">@@ -41,9 +42,7 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-getcwd.diff \
- patch-uuid.diff \
- patch-gschema.xml.in.diff \
</del><ins>+patchfiles patch-uuid.diff \
</ins><span class="cx"> no-dupfd_cloexec.patch
</span><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="lines">@@ -56,12 +55,14 @@
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><span class="cx"> configure.args --with-gtk=3.0 \
</span><ins>+ --with-nautilus-extension=no \
</ins><span class="cx"> --disable-migration \
</span><ins>+ --disable-search-provider \
</ins><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-schemas-compile
</span><span class="cx">
</span><span class="cx"> variant nautilus description {Build optional nautilus extension} {
</span><del>- configure.args-append --with-nautilus-extension
</del><ins>+ configure.args-replace --with-nautilus-extension=no --with-nautilus-extension=yes
</ins><span class="cx"> depends_lib-append port:nautilus
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,6 +71,8 @@
</span><span class="cx"> depends_lib-append port:gconf
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+default_variants +nautilus
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span></span></pre></div>
<a id="trunkdportsgnomegnometerminalfilesnodupfd_cloexecpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch (118924 => 118925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-04-14 01:58:20 UTC (rev 118925)
</span><span class="lines">@@ -1,13 +1,22 @@
</span><del>---- src/terminal-screen.c.orig 2013-10-14 12:26:50.000000000 -0700
-+++ src/terminal-screen.c 2013-11-25 18:08:22.000000000 -0800
-@@ -1338,7 +1338,12 @@
</del><ins>+--- src/terminal-screen.c.orig 2014-02-17 13:39:53.000000000 -0800
++++ src/terminal-screen.c 2014-03-14 09:35:53.000000000 -0700
+@@ -27,7 +27,7 @@
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
+-#include <uuid.h>
++#include <uuid/uuid.h>
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -1243,7 +1243,12 @@
</ins><span class="cx"> for (j = 0; j < n_fds; j++) {
</span><span class="cx"> if (fds[j] == target_fd) {
</span><span class="cx"> do {
</span><span class="cx"> +#ifdef F_DUPFD_CLOEXEC
</span><del>- fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 10);
</del><ins>+ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
</ins><span class="cx"> +#else
</span><del>-+ fd = fcntl (fds[j], F_DUPFD, 10);
</del><ins>++ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
</ins><span class="cx"> + fcntl(fd, F_SETFD, FD_CLOEXEC);
</span><span class="cx"> +#endif
</span><span class="cx"> } while (fd == -1 && errno == EINTR);
</span></span></pre></div>
<a id="trunkdportsgnomegnometerminalfilespatchgetcwddiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff (118924 => 118925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-04-14 01:58:20 UTC (rev 118925)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-diff -ur src.orig/client.c src/client.c
---- src.orig/client.c 2013-07-07 03:54:02.000000000 -0700
-+++ src/client.c 2013-09-14 13:19:28.000000000 -0700
-@@ -33,6 +33,10 @@
- #include <unistd.h>
- #include <sys/wait.h>
-
-+#ifdef __APPLE__
-+#include <sys/param.h>
-+#endif
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gprintf.h>
-@@ -521,7 +525,11 @@
- * because we want to use the value from PWD (if it is correct).
- * See bug 502146.
- */
-+#ifdef __APPLE__
-+ cwd = getcwd (NULL, MAXPATHLEN);
-+#else
- cwd = get_current_dir_name ();
-+#endif
- data->working_directory = g_strdup (cwd);
- free (cwd);
- }
---- src/terminal.c.orig 2013-10-08 13:17:46.000000000 -0700
-+++ src/terminal.c 2013-11-25 18:08:22.000000000 -0800
-@@ -28,6 +28,10 @@
- #include <time.h>
- #include <unistd.h>
-
-+#ifdef __APPLE__
-+#include <sys/param.h>
-+#endif
-+
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <gio/gio.h>
-@@ -233,7 +237,11 @@
- * because we want to use the value from PWD (if it is correct).
- * See bug 502146.
- */
-+#ifdef __APPLE__
-+ cwd = getcwd (NULL, MAXPATHLEN);
-+#else
- cwd = get_current_dir_name ();
-+#endif
- working_directory = g_strdup (cwd);
- free (cwd);
-
</del></span></pre></div>
<a id="trunkdportsgnomegnometerminalfilespatchuuiddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff (118924 => 118925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-04-14 01:58:20 UTC (rev 118925)
</span><span class="lines">@@ -10,11 +10,10 @@
</span><span class="cx"> #include <dconf.h>
</span><span class="cx">
</span><span class="cx"> #include <glib.h>
</span><del>-diff -ur src.orig/terminal-profiles-list.c src/terminal-profiles-list.c
---- src.orig/terminal-profiles-list.c 2013-06-21 09:10:02.000000000 -0700
-+++ src/terminal-profiles-list.c 2013-09-14 22:42:51.000000000 -0700
-@@ -25,7 +25,7 @@
- #include "terminal-schemas.h"
</del><ins>+--- src/terminal-profiles-list.c.orig 2013-11-20 14:44:26.000000000 -0800
++++ src/terminal-profiles-list.c 2014-01-24 15:34:04.000000000 -0800
+@@ -26,7 +26,7 @@
+ #include "terminal-libgsystem.h"
</ins><span class="cx">
</span><span class="cx"> #include <string.h>
</span><span class="cx"> -#include <uuid.h>
</span><span class="lines">@@ -34,13 +33,24 @@
</span><span class="cx"> #include <dconf.h>
</span><span class="cx">
</span><span class="cx"> #include "terminal-type-builtins.h"
</span><del>---- configure.ac.orig 2014-02-24 14:08:39.000000000 -0800
-+++ configure.ac 2014-02-24 14:08:49.000000000 -0800
-@@ -82,7 +82,6 @@
</del><ins>+--- src/terminal-window.c.orig 2014-03-14 09:31:11.000000000 -0700
++++ src/terminal-window.c 2014-03-14 09:32:14.000000000 -0700
+@@ -29,7 +29,7 @@
+ #ifdef GDK_WINDOWING_X11
+ #include <gdk/gdkx.h>
+ #endif
+-#include <uuid.h>
++#include <uuid/uuid.h>
+
+ #include "terminal-app.h"
+ #include "terminal-debug.h"
+--- configure.ac.orig 2014-02-19 11:59:55.000000000 -0800
++++ configure.ac 2014-03-14 09:33:28.000000000 -0700
+@@ -78,7 +78,6 @@
</ins><span class="cx"> gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
</span><span class="cx"> gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
</span><span class="cx"> dconf >= $DCONF_REQUIRED
</span><span class="cx"> - uuid
</span><span class="cx"> $PLATFORM_DEPS])
</span><span class="cx">
</span><del>- # DConf broke API without changing the pkgconfig name
</del><ins>+ # ****
</ins></span></pre>
</div>
</div>
</body>
</html>