<!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>[121778] users/devans/GNOME-3/unstable/dports/gnome/glom</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/121778">121778</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-07 16:02:11 -0700 (Mon, 07 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: glom, merge recent commits from stable.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomeglomPortfile">users/devans/GNOME-3/unstable/dports/gnome/glom/Portfile</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomeglom">users/devans/GNOME-3/unstable/dports/gnome/glom/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3unstabledportsgnomeglom"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/unstable/dports/gnome/glom</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/rmstonecipher/gnome/glom:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/glom: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/glom:121764-121777
</span><span class="cx">/users/rmstonecipher/gnome/glom:102363-103172
</span><a id="usersdevansGNOME3unstabledportsgnomeglomPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/glom/Portfile (121777 => 121778)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/glom/Portfile 2014-07-07 22:10:33 UTC (rev 121777)
+++ users/devans/GNOME-3/unstable/dports/gnome/glom/Portfile 2014-07-07 23:02:11 UTC (rev 121778)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx"> port:libxslt \
</span><span class="cx"> port:py27-sphinx
</span><span class="cx">
</span><del>-depends_lib port:libarchive \
</del><ins>+depends_lib port:desktop-file-utils \
+ port:libarchive \
+ port:gtkmm3 \
</ins><span class="cx"> port:boost \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:libxmlxx2 \
</span><span class="lines">@@ -51,12 +53,10 @@
</span><span class="cx"> port:evince \
</span><span class="cx"> port:shared-mime-info
</span><span class="cx">
</span><del>-depends_run port:gnome-keyring
</del><ins>+depends_run port:gnome-settings-daemon \
+ port:yelp \
+ port:gnome-keyring
</ins><span class="cx">
</span><del>-post-extract {
- copy ${worksrcpath}/configure.ac ${worksrcpath}/configure.ac.orig
-}
-
</del><span class="cx"> patchfiles patch-configure.ac.diff \
</span><span class="cx"> patch-glom-libglom-connectionpool.cc.diff
</span><span class="cx">
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx">
</span><span class="cx"> configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch} \
</span><span class="cx"> PYTHON_EXTRA_LDFLAGS=' '
</span><ins>+
</ins><span class="cx"> configure.perl ${prefix}/bin/perl5.16
</span><span class="cx">
</span><del>-
</del><span class="cx"> configure.args --with-boost-python=mt \
</span><span class="cx"> --with-postgres-utils=${prefix}/lib/postgresql93/bin \
</span><span class="cx"> --disable-mysql \
</span><span class="lines">@@ -94,6 +94,8 @@
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><ins>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</ins><span class="cx"> system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>