<!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>[141856] users/devans/GNOME-3/unstable/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/141856">141856</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-29 13:34:38 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: gnome-terminal, update to version 3.19.1, configuration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegnometerminalPortfile">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchsrcMakefileamdiff">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchuuiddiff">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchsrcterminalscreencdiff">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegnometerminalfilesnodupfd_cloexecpatch">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3unstabledportsgnomegnometerminalPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile (141855 => 141856)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2015-10-29 20:34:38 UTC (rev 141856)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-terminal
</span><del>-version 3.18.1
</del><ins>+version 3.19.1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Terminal component for the GNOME 3 Desktop
</span><span class="cx"> long_description ${description}
</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 27a65f0f03ffde5169605a7bd6419859d03c32b4 \
- sha256 6eecc81f38c8019d9f49b8950cd814da88d84a8d98c9da98a57be06a1b9f4119
</del><ins>+checksums rmd160 2d34fe6d34bde219f40d9867d2eb80e2af9e3036 \
+ sha256 d8163333e9255fea53f66e38268edd0927e18042b2f95bf94e8cf82602451122
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><span class="cx"> patchfiles patch-uuid.diff \
</span><del>- no-dupfd_cloexec.patch \
</del><span class="cx"> patch-src-Makefile.am.diff \
</span><ins>+ patch-src-terminal-screen.c.diff \
</ins><span class="cx"> patch-src-server.c.diff
</span><span class="cx">
</span><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx">
</span><span class="cx"> configure.args --with-gtk=3.0 \
</span><span class="cx"> --with-nautilus-extension=no \
</span><ins>+ --with-pcre2=no \
</ins><span class="cx"> --enable-debug \
</span><span class="cx"> --disable-migration \
</span><span class="cx"> --disable-search-provider \
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegnometerminalfilesnodupfd_cloexecpatch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch (141855 => 141856)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2015-10-29 20:34:38 UTC (rev 141856)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>---- src/terminal-screen.c.orig 2015-10-12 09:24:11.000000000 -0700
-+++ src/terminal-screen.c 2015-10-13 14:10:01.000000000 -0700
-@@ -27,7 +27,7 @@
- #include <unistd.h>
- #include <sys/wait.h>
- #include <fcntl.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
-
- #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- #include <sys/sysctl.h>
-@@ -1214,7 +1214,12 @@
- for (j = 0; j < n_fds; j++) {
- if (fds[j] == target_fd) {
- do {
-+#ifdef F_DUPFD_CLOEXEC
- fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
-+#else
-+ fd = fcntl (fds[j], F_DUPFD, 3);
-+ fcntl(fd, F_SETFD, FD_CLOEXEC);
-+#endif
- } while (fd == -1 && errno == EINTR);
- if (fd == -1)
- _exit (127);
</del></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchsrcMakefileamdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff (141855 => 141856)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2015-10-29 20:34:38 UTC (rev 141856)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- src/Makefile.am.orig 2015-02-09 11:27:29.000000000 -0800
</span><span class="cx"> +++ src/Makefile.am 2015-02-19 18:09:35.000000000 -0800
</span><del>-@@ -200,8 +200,6 @@
</del><ins>+@@ -201,8 +201,6 @@
</ins><span class="cx"> $(AM_CFLAGS) \
</span><span class="cx"> -Wno-cast-qual \
</span><span class="cx"> -Wno-format-nonliteral \
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchsrcterminalscreencdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff (0 => 141856)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff 2015-10-29 20:34:38 UTC (rev 141856)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+--- src/terminal-screen.c.orig 2015-10-27 17:31:24.000000000 -0700
++++ src/terminal-screen.c 2015-10-29 13:09:11.000000000 -0700
+@@ -31,7 +31,7 @@
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
+-#include <uuid.h>
++#include <uuid/uuid.h>
+
+ #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+@@ -1271,7 +1271,12 @@
+ for (j = 0; j < n_fds; j++) {
+ if (fds[j] == target_fd) {
+ do {
++#ifdef F_DUPFD_CLOEXEC
+ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
++#else
++ fd = fcntl (fds[j], F_DUPFD, 3);
++ fcntl(fd, F_SETFD, FD_CLOEXEC);
++#endif
+ } while (fd == -1 && errno == EINTR);
+ if (fd == -1)
+ _exit (127);
+@@ -1972,8 +1977,6 @@
+ }
+ }
+ }
+-
+- return NULL;
+ }
+
+ /**
</ins></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchuuiddiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff (141855 => 141856)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2015-10-29 20:34:38 UTC (rev 141856)
</span><span class="lines">@@ -32,16 +32,6 @@
</span><span class="cx">
</span><span class="cx"> #include "terminal-app.h"
</span><span class="cx"> #include "terminal-debug.h"
</span><del>---- configure.ac.orig 2014-05-28 10:42:49.000000000 -0700
-+++ configure.ac 2014-05-28 11:52:45.000000000 -0700
-@@ -80,7 +80,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS])
-
- # ****
</del><span class="cx"> --- src/terminal-settings-list.c.orig 2015-09-21 12:44:45.000000000 -0700
</span><span class="cx"> +++ src/terminal-settings-list.c 2015-10-13 14:10:01.000000000 -0700
</span><span class="cx"> @@ -20,7 +20,7 @@
</span><span class="lines">@@ -53,3 +43,30 @@
</span><span class="cx"> #include <dconf.h>
</span><span class="cx">
</span><span class="cx"> #define G_SETTINGS_ENABLE_BACKEND
</span><ins>+--- configure.ac.orig 2015-10-27 17:31:24.000000000 -0700
++++ configure.ac 2015-10-29 12:54:55.000000000 -0700
+@@ -106,7 +106,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS
+ $PCRE2_PKGS])
+
+@@ -129,7 +128,6 @@
+ gio-unix-2.0 >= $GIO_REQUIRED
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS])
+ ])
+
+@@ -175,7 +173,7 @@
+ vte-$VTE_API_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid])
++ ])
+ AC_DEFINE([ENABLE_MIGRATION],[1],[Define to 1 to enable prefs migration from GConf to GSettings])
+ fi
+
</ins></span></pre>
</div>
</div>
</body>
</html>