<!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>[145884] 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/145884">145884</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-02-19 11:55:33 -0800 (Fri, 19 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: gnome-terminal, update to version 3.19.90, use system uuid, disable pcre2, not supported by vte 0.43.90+.</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="#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="#usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchuuiddiff">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff</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 (145883 => 145884)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2016-02-19 19:29:35 UTC (rev 145883)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2016-02-19 19:55:33 UTC (rev 145884)
</span><span class="lines">@@ -5,8 +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.19.1
-revision 1
</del><ins>+version 3.19.90
</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">@@ -19,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 2d34fe6d34bde219f40d9867d2eb80e2af9e3036 \
- sha256 d8163333e9255fea53f66e38268edd0927e18042b2f95bf94e8cf82602451122
</del><ins>+checksums rmd160 dafe1542eb3aa1a6bd1ac5b4455f3c9d3cd20f2a \
+ sha256 c2be96fc8bdc9a52872d5f4eeb3fa230f3f3cbecf71f253465b20d209a0193fa
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -39,15 +38,12 @@
</span><span class="cx"> port:vte \
</span><span class="cx"> port:dbus \
</span><span class="cx"> port:dconf \
</span><del>- port:ossp-uuid \
- port:pcre2 \
</del><span class="cx"> port:xorg-libX11
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-themes-standard \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-uuid.diff \
- patch-src-Makefile.am.diff \
</del><ins>+patchfiles patch-src-Makefile.am.diff \
</ins><span class="cx"> patch-src-terminal-screen.c.diff \
</span><span class="cx"> patch-src-server.c.diff
</span><span class="cx">
</span><span class="lines">@@ -65,13 +61,16 @@
</span><span class="cx">
</span><span class="cx"> configure.args --with-gtk=3.0 \
</span><span class="cx"> --with-nautilus-extension=no \
</span><del>- --with-pcre2=yes \
</del><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 class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-schemas-compile
</span><span class="cx">
</span><ins>+configure.cflags-append \
+ -I/usr/include/uuid
+
</ins><span class="cx"> variant nautilus description {Build optional nautilus extension} {
</span><span class="cx"> configure.args-replace --with-nautilus-extension=no --with-nautilus-extension=yes
</span><span class="cx"> depends_lib-append port:nautilus
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchsrcterminalscreencdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff (145883 => 145884)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff 2016-02-19 19:29:35 UTC (rev 145883)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff 2016-02-19 19:55:33 UTC (rev 145884)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
</span><span class="cx"> #include <sys/sysctl.h>
</span><del>-@@ -1271,7 +1271,12 @@
</del><ins>+@@ -1331,7 +1331,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="lines">@@ -22,12 +22,3 @@
</span><span class="cx"> } while (fd == -1 && errno == EINTR);
</span><span class="cx"> if (fd == -1)
</span><span class="cx"> _exit (127);
</span><del>-@@ -1972,8 +1977,6 @@
- }
- }
- }
--
-- return NULL;
- }
-
- /**
</del></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchuuiddiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff (145883 => 145884)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2016-02-19 19:29:35 UTC (rev 145883)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2016-02-19 19:55:33 UTC (rev 145884)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-diff -ur src.orig/terminal-prefs.c src/terminal-prefs.c
---- src.orig/terminal-prefs.c 2013-07-07 03:54:03.000000000 -0700
-+++ src/terminal-prefs.c 2013-09-14 22:42:22.000000000 -0700
-@@ -20,7 +20,7 @@
-
- #include <string.h>
-
--#include <uuid.h>
-+#include <uuid/uuid.h>
- #include <dconf.h>
-
- #include <glib.h>
---- 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"
-
- #include <string.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
-
- /* Counts occurrences of @str in @strv */
- static guint
---- 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"
---- src/terminal-settings-list.c.orig 2015-09-21 12:44:45.000000000 -0700
-+++ src/terminal-settings-list.c 2015-10-13 14:10:01.000000000 -0700
-@@ -20,7 +20,7 @@
- #include "terminal-settings-list.h"
-
- #include <string.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
- #include <dconf.h>
-
- #define G_SETTINGS_ENABLE_BACKEND
---- 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
-
</del></span></pre>
</div>
</div>
</body>
</html>