<!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>[117386] 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/117386">117386</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-02-24 14:17:47 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-terminal: replace in-tree intltool.m4 with our version, autoreconf to correct intltool configuration, build deps.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnometerminalPortfile">trunk/dports/gnome/gnome-terminal/Portfile</a></li>
<li><a href="#trunkdportsgnomegnometerminalfilespatchuuiddiff">trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnometerminalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-terminal/Portfile (117385 => 117386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/Portfile 2014-02-24 20:57:01 UTC (rev 117385)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2014-02-24 22:17:47 UTC (rev 117386)
</span><span class="lines">@@ -24,7 +24,9 @@
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:itstool \
</span><del>- port:libxml2
</del><ins>+ port:yelp-tools \
+ port:libxml2 \
+ port:gnome-common
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-icon-theme \
</span><span class="lines">@@ -44,6 +46,15 @@
</span><span class="cx"> patch-gschema.xml.in.diff \
</span><span class="cx"> no-dupfd_cloexec.patch
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --with-gtk=3.0 \
</span><span class="cx"> --disable-migration \
</span><span class="cx"> --disable-silent-rules \
</span></span></pre></div>
<a id="trunkdportsgnomegnometerminalfilespatchuuiddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff (117385 => 117386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-02-24 20:57:01 UTC (rev 117385)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-02-24 22:17:47 UTC (rev 117386)
</span><span class="lines">@@ -34,153 +34,13 @@
</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 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13136,7 +13135,6 @@
</del><ins>+--- 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 @@
</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><del>- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13147,7 +13145,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13166,7 +13163,6 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13174,7 +13170,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13185,7 +13180,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13213,7 +13207,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- else
- TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte$VTE_PC_VERSION >= $VTE_REQUIRED
-@@ -13222,7 +13215,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -13234,7 +13226,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS) were not met:
</del><ins>+ $PLATFORM_DEPS])
</ins><span class="cx">
</span><del>- $TERM_PKG_ERRORS
-@@ -13574,13 +13565,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13589,7 +13580,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13606,13 +13597,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13621,7 +13612,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13647,14 +13638,14 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- else
- MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MIGRATOR_PKG_ERRORS" >&5
-@@ -13664,7 +13655,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid) were not met:
-+ ) were not met:
-
- $MIGRATOR_PKG_ERRORS
-
</del><ins>+ # DConf broke API without changing the pkgconfig name
</ins></span></pre>
</div>
</div>
</body>
</html>