<!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>[116528] users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files</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/116528">116528</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-27 08:45:48 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable/dports: gnome-terminal, update patches to fix build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegnometerminalfilesnodupfd_cloexecpatch">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchgetcwddiff">users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff</a></li>
<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="usersdevansGNOME3unstabledportsgnomegnometerminalfilesnodupfd_cloexecpatch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch (116527 => 116528)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-01-27 16:42:33 UTC (rev 116527)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-01-27 16:45:48 UTC (rev 116528)
</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-01-24 16:01:58.000000000 -0800
++++ src/terminal-screen.c 2014-01-24 16:03:09.000000000 -0800
+@@ -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>
+@@ -1220,7 +1220,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="usersdevansGNOME3unstabledportsgnomegnometerminalfilespatchgetcwddiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff (116527 => 116528)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-01-27 16:42:33 UTC (rev 116527)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-01-27 16:45:48 UTC (rev 116528)
</span><span class="lines">@@ -1,6 +1,5 @@
</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
</del><ins>+--- src/client.c.orig 2013-11-20 14:44:25.000000000 -0800
++++ src/client.c 2014-01-24 15:32:28.000000000 -0800
</ins><span class="cx"> @@ -33,6 +33,10 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <sys/wait.h>
</span><span class="lines">@@ -12,7 +11,7 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <glib/gi18n.h>
</span><span class="cx"> #include <glib/gprintf.h>
</span><del>-@@ -521,7 +525,11 @@
</del><ins>+@@ -524,7 +528,11 @@
</ins><span class="cx"> * because we want to use the value from PWD (if it is correct).
</span><span class="cx"> * See bug 502146.
</span><span class="cx"> */
</span><span class="lines">@@ -24,8 +23,8 @@
</span><span class="cx"> data->working_directory = g_strdup (cwd);
</span><span class="cx"> free (cwd);
</span><span class="cx"> }
</span><del>---- src/terminal.c.orig 2013-10-08 13:17:46.000000000 -0700
-+++ src/terminal.c 2013-11-25 18:08:22.000000000 -0800
</del><ins>+--- src/terminal.c.orig 2014-01-24 15:50:25.000000000 -0800
++++ src/terminal.c 2014-01-24 15:53:08.000000000 -0800
</ins><span class="cx"> @@ -28,6 +28,10 @@
</span><span class="cx"> #include <time.h>
</span><span class="cx"> #include <unistd.h>
</span><span class="lines">@@ -41,11 +40,11 @@
</span><span class="cx"> * because we want to use the value from PWD (if it is correct).
</span><span class="cx"> * See bug 502146.
</span><span class="cx"> */
</span><del>-+#ifdef __APPLE__
</del><ins>++#ifdef __APPLE__
</ins><span class="cx"> + cwd = getcwd (NULL, MAXPATHLEN);
</span><del>-+#else
</del><ins>++#else
</ins><span class="cx"> cwd = get_current_dir_name ();
</span><del>-+#endif
</del><ins>++#endif
</ins><span class="cx"> working_directory = g_strdup (cwd);
</span><span class="cx"> free (cwd);
</span><span class="cx">
</span></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 (116527 => 116528)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-01-27 16:42:33 UTC (rev 116527)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-01-27 16:45:48 UTC (rev 116528)
</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,9 +33,9 @@
</span><span class="cx"> #include <dconf.h>
</span><span class="cx">
</span><span class="cx"> #include "terminal-type-builtins.h"
</span><del>---- configure.orig 2013-10-14 12:28:06.000000000 -0700
-+++ configure 2013-11-25 18:05:42.000000000 -0800
-@@ -13128,7 +13128,6 @@
</del><ins>+--- configure.orig 2013-11-20 14:44:41.000000000 -0800
++++ configure 2014-01-24 15:37:08.000000000 -0800
+@@ -13120,7 +13120,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="lines">@@ -44,7 +43,7 @@
</span><span class="cx"> \$PLATFORM_DEPS\""; } >&5
</span><span class="cx"> ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
</span><span class="cx"> glib-2.0 >= $GLIB_REQUIRED
</span><del>-@@ -13136,7 +13135,6 @@
</del><ins>+@@ -13128,7 +13127,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="lines">@@ -52,7 +51,7 @@
</span><span class="cx"> $PLATFORM_DEPS") 2>&5
</span><span class="cx"> ac_status=$?
</span><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><del>-@@ -13147,7 +13145,6 @@
</del><ins>+@@ -13139,7 +13137,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="lines">@@ -60,7 +59,7 @@
</span><span class="cx"> $PLATFORM_DEPS" 2>/dev/null`
</span><span class="cx"> test "x$?" != "x0" && pkg_failed=yes
</span><span class="cx"> else
</span><del>-@@ -13166,7 +13163,6 @@
</del><ins>+@@ -13158,7 +13155,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="lines">@@ -68,7 +67,7 @@
</span><span class="cx"> \$PLATFORM_DEPS\""; } >&5
</span><span class="cx"> ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
</span><span class="cx"> glib-2.0 >= $GLIB_REQUIRED
</span><del>-@@ -13174,7 +13170,6 @@
</del><ins>+@@ -13166,7 +13162,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="lines">@@ -76,7 +75,7 @@
</span><span class="cx"> $PLATFORM_DEPS") 2>&5
</span><span class="cx"> ac_status=$?
</span><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><del>-@@ -13185,7 +13180,6 @@
</del><ins>+@@ -13177,7 +13172,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="lines">@@ -84,7 +83,7 @@
</span><span class="cx"> $PLATFORM_DEPS" 2>/dev/null`
</span><span class="cx"> test "x$?" != "x0" && pkg_failed=yes
</span><span class="cx"> else
</span><del>-@@ -13213,7 +13207,6 @@
</del><ins>+@@ -13205,7 +13199,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="lines">@@ -92,7 +91,7 @@
</span><span class="cx"> $PLATFORM_DEPS" 2>&1`
</span><span class="cx"> else
</span><span class="cx"> TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte$VTE_PC_VERSION >= $VTE_REQUIRED
</span><del>-@@ -13222,7 +13215,6 @@
</del><ins>+@@ -13214,7 +13207,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="lines">@@ -100,7 +99,7 @@
</span><span class="cx"> $PLATFORM_DEPS" 2>&1`
</span><span class="cx"> fi
</span><span class="cx"> # Put the nasty error message in config.log where it belongs
</span><del>-@@ -13234,7 +13226,6 @@
</del><ins>+@@ -13226,7 +13218,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="lines">@@ -108,7 +107,7 @@
</span><span class="cx"> $PLATFORM_DEPS) were not met:
</span><span class="cx">
</span><span class="cx"> $TERM_PKG_ERRORS
</span><del>-@@ -13574,13 +13565,13 @@
</del><ins>+@@ -13566,13 +13557,13 @@
</ins><span class="cx"> vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
</span><span class="cx"> gconf-2.0 >= \$GCONF_REQUIRED
</span><span class="cx"> dconf >= \$DCONF_REQUIRED
</span><span class="lines">@@ -124,7 +123,7 @@
</span><span class="cx"> ac_status=$?
</span><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span class="cx"> test $ac_status = 0; }; then
</span><del>-@@ -13589,7 +13580,7 @@
</del><ins>+@@ -13581,7 +13572,7 @@
</ins><span class="cx"> vte$VTE_PC_VERSION >= $VTE_REQUIRED
</span><span class="cx"> gconf-2.0 >= $GCONF_REQUIRED
</span><span class="cx"> dconf >= $DCONF_REQUIRED
</span><span class="lines">@@ -133,7 +132,7 @@
</span><span class="cx"> test "x$?" != "x0" && pkg_failed=yes
</span><span class="cx"> else
</span><span class="cx"> pkg_failed=yes
</span><del>-@@ -13606,13 +13597,13 @@
</del><ins>+@@ -13598,13 +13589,13 @@
</ins><span class="cx"> vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
</span><span class="cx"> gconf-2.0 >= \$GCONF_REQUIRED
</span><span class="cx"> dconf >= \$DCONF_REQUIRED
</span><span class="lines">@@ -149,7 +148,7 @@
</span><span class="cx"> ac_status=$?
</span><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span class="cx"> test $ac_status = 0; }; then
</span><del>-@@ -13621,7 +13612,7 @@
</del><ins>+@@ -13613,7 +13604,7 @@
</ins><span class="cx"> vte$VTE_PC_VERSION >= $VTE_REQUIRED
</span><span class="cx"> gconf-2.0 >= $GCONF_REQUIRED
</span><span class="cx"> dconf >= $DCONF_REQUIRED
</span><span class="lines">@@ -158,7 +157,7 @@
</span><span class="cx"> test "x$?" != "x0" && pkg_failed=yes
</span><span class="cx"> else
</span><span class="cx"> pkg_failed=yes
</span><del>-@@ -13647,14 +13638,14 @@
</del><ins>+@@ -13639,14 +13630,14 @@
</ins><span class="cx"> vte$VTE_PC_VERSION >= $VTE_REQUIRED
</span><span class="cx"> gconf-2.0 >= $GCONF_REQUIRED
</span><span class="cx"> dconf >= $DCONF_REQUIRED
</span><span class="lines">@@ -175,7 +174,7 @@
</span><span class="cx"> fi
</span><span class="cx"> # Put the nasty error message in config.log where it belongs
</span><span class="cx"> echo "$MIGRATOR_PKG_ERRORS" >&5
</span><del>-@@ -13664,7 +13655,7 @@
</del><ins>+@@ -13656,7 +13647,7 @@
</ins><span class="cx"> vte$VTE_PC_VERSION >= $VTE_REQUIRED
</span><span class="cx"> gconf-2.0 >= $GCONF_REQUIRED
</span><span class="cx"> dconf >= $DCONF_REQUIRED
</span><span class="lines">@@ -184,3 +183,14 @@
</span><span class="cx">
</span><span class="cx"> $MIGRATOR_PKG_ERRORS
</span><span class="cx">
</span><ins>+--- src/terminal-window.c.orig 2014-01-24 16:02:20.000000000 -0800
++++ src/terminal-window.c 2014-01-24 16:05:40.000000000 -0800
+@@ -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"
</ins></span></pre>
</div>
</div>
</body>
</html>