<!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>[120529] users/devans/GNOME-3/stable/dports</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/120529">120529</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-05-31 12:35:59 -0700 (Sat, 31 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: sync ports with trunk:
* devel/json-glib
* devel/zeitgeist
* gnome/geocode-glib
* dports/gnome/gjs
* dports/gnome/gtk3
* dports/gnome/libsoup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdeveljsonglibPortfile">users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelzeitgeistPortfile">users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegeocodeglibPortfile">users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegjsPortfile">users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegtk3Portfile">users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibsoupPortfile">users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdevelzeitgeistfilespatchlibzeitgeistMakefileamdiff">users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gtk3/files/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/</li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdeveljsonglib">users/devans/GNOME-3/stable/dports/devel/json-glib/</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelzeitgeist">users/devans/GNOME-3/stable/dports/devel/zeitgeist/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegeocodeglib">users/devans/GNOME-3/stable/dports/gnome/geocode-glib/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegjs">users/devans/GNOME-3/stable/dports/gnome/gjs/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegtk3">users/devans/GNOME-3/stable/dports/gnome/gtk3/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibsoup">users/devans/GNOME-3/stable/dports/gnome/libsoup/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsdeveljsonglib"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/devel/json-glib</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/cal/ports/devel/json-glib:96570-97031
</span><span class="cx"> + /branches/mld-qt-481/dports/devel/json-glib:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/devel/json-glib:117602-120528
</span><span class="cx">/users/cal/ports/devel/json-glib:96570-97031
</span><a id="usersdevansGNOME3stabledportsdeveljsonglibPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile (120528 => 120529)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile 2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile 2014-05-31 19:35:59 UTC (rev 120529)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name json-glib
</span><del>-version 1.0.0
</del><ins>+version 1.0.2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel
</span><span class="cx"> license LGPL-2.1+
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 e9a99e1179b446cca06ad7c17b3c03a94d67efc9 \
- sha256 dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde
</del><ins>+checksums rmd160 f80ecfdd7f6a0f8fa2dd8f5cdf704a301582bad5 \
+ sha256 887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-introspection=yes
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelzeitgeist"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/devel/zeitgeist</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/devel/zeitgeist:118239-119099
</span><span class="cx">/users/cal/ports/devel/zeitgeist:96570-97031
</span><span class="cx"> + /branches/mld-qt-481/dports/devel/zeitgeist:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/devel/zeitgeist:118239-120528
</span><span class="cx">/users/cal/ports/devel/zeitgeist:96570-97031
</span><a id="usersdevansGNOME3stabledportsdevelzeitgeistPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile (120528 => 120529)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile 2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile 2014-05-31 19:35:59 UTC (rev 120529)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name zeitgeist
</span><span class="cx"> version 0.9.14
</span><del>-revision 3
</del><ins>+revision 6
</ins><span class="cx"> license LGPL-2.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Zeitgeist is a service which logs the users's activities and \
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> port:raptor2 \
</span><span class="cx"> port:vala
</span><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-libzeitgeist-Makefile.am.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|^#\!.*|#!${configure.python}|" \
</span><span class="lines">@@ -67,8 +68,12 @@
</span><span class="cx">
</span><span class="cx"> configure.cmd ./autogen.sh
</span><span class="cx"> configure.args --disable-silent-rules \
</span><del>- --disable-introspection
</del><ins>+ --enable-introspection
</ins><span class="cx">
</span><ins>+# gobject-introspection uses g-ir-scanner, which uses $CC from env
+build.args-append CC="${configure.cc} ${configure.cc_archflags}"
+destroot.args-append CC="${configure.cc} ${configure.cc_archflags}"
+
</ins><span class="cx"> variant python25 conflicts python26 python27 description {Build using Python 2.5} {
</span><span class="cx"> depends_lib-append port:py25-rdflib
</span><span class="cx"> configure.python ${prefix}/bin/python2.5
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelzeitgeistfilespatchlibzeitgeistMakefileamdifffromrev120528trunkdportsdevelzeitgeistfilespatchlibzeitgeistMakefileamdiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff (from rev 120528, trunk/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff) (0 => 120529)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff 2014-05-31 19:35:59 UTC (rev 120529)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+=== modified file 'libzeitgeist/Makefile.am'
+--- libzeitgeist/Makefile.am 2013-03-18 12:56:51 +0000
++++ libzeitgeist/Makefile.am 2014-01-27 21:45:42 +0000
+@@ -186,7 +186,7 @@
+ # We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002.
+ # This is what g-ir-scanner does.
+ libzeitgeist_dlname = \
+- `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la`
++ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la`
+
+ if HAVE_INTROSPECTION
+ libzeitgeist_2_0_gir_VALASOURCES = \
+
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegeocodeglib"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/geocode-glib</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/geocode-glib:116274-119100
</span><span class="cx">/users/rmstonecipher/gnome/geocode-glib:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/geocode-glib:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/geocode-glib:116274-120528
</span><span class="cx">/users/rmstonecipher/gnome/geocode-glib:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegeocodeglibPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile (120528 => 120529)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile 2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile 2014-05-31 19:35:59 UTC (rev 120529)
</span><span class="lines">@@ -49,4 +49,10 @@
</span><span class="cx"> configure.args --enable-introspection=yes \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><ins>+platform darwin 8 {
+ # The rules enabled by gobject-introspection require GNU make 3.81+
+ depends_build-append port:gmake
+ build.cmd ${prefix}/bin/gmake
+}
+
</ins><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegjs"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gjs</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gjs:116275-119077
</span><span class="cx">/users/rmstonecipher/gnome/gjs:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gjs:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gjs:116275-120528
</span><span class="cx">/users/rmstonecipher/gnome/gjs:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegjsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile (120528 => 120529)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile 2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile 2014-05-31 19:35:59 UTC (rev 120529)
</span><span class="lines">@@ -41,10 +41,7 @@
</span><span class="cx">
</span><span class="cx"> # Blacklist needs to match mozjs24:
</span><span class="cx"> # /opt/local/include/mozjs-24/mozilla/Compiler.h:22:4: error: #error "mfbt (and Gecko) require at least gcc 4.4 to build."
</span><del>-# blacklist macports-clang-3.3 which breaks build when linking C++ by passing -export_dynamic to ld
-# add macports-clang-3.4 which builds correctly to fallback list
-compiler.blacklist *gcc* {clang < 300} macports-clang-3.3
-compiler.fallback-append macports-clang-3.4
</del><ins>+compiler.blacklist *gcc* {clang < 300}
</ins><span class="cx">
</span><span class="cx"> configure.args --disable-silent-rules
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegtk3"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gtk3</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/gtk3:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gtk3:119527-120528
</span><span class="cx">/users/rmstonecipher/gnome/gtk3:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegtk3Portfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile (120528 => 120529)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile 2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile 2014-05-31 19:35:59 UTC (rev 120529)
</span><span class="lines">@@ -36,6 +36,9 @@
</span><span class="cx"> ftp://ftp.gtk.org/pub/gtk/${branch}/ \
</span><span class="cx"> http://ftp.gtk.org/pub/gtk/${branch}/
</span><span class="cx">
</span><ins>+# See http://trac.macports.org/ticket/43283
+patchfiles patch-backingScaleFactor.diff
+
</ins><span class="cx"> minimum_xcodeversions {9 3.1}
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomelibsoup"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/libsoup</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/libsoup:116350-120049
</span><span class="cx">/users/rmstonecipher/gnome/libsoup:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/libsoup:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/libsoup:116350-120528
</span><span class="cx">/users/rmstonecipher/gnome/libsoup:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomelibsoupPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile (120528 => 120529)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile 2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile 2014-05-31 19:35:59 UTC (rev 120529)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> platform darwin 8 {
</span><span class="cx"> # The rules enabled by gobject-introspection require GNU make 3.81+
</span><del>- depends_run-append port:gmake
</del><ins>+ depends_build-append port:gmake
</ins><span class="cx"> build.cmd ${prefix}/bin/gmake
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>