<!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>[128298] 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/128298">128298</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-11-18 10:35:26 -0800 (Tue, 18 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>GNOME-3/stable: glib2, easytag, merge sync with trunk.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsaudioeasytagPortfile">users/devans/GNOME-3/stable/dports/audio/easytag/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2Portfile">users/devans/GNOME-3/stable/dports/devel/glib2/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filesyosemitelibtoolpatch">users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filesyosemitesymbollookuppatch">users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsaudioeasytag">users/devans/GNOME-3/stable/dports/audio/easytag/</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2">users/devans/GNOME-3/stable/dports/devel/glib2/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsaudioeasytag"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/audio/easytag</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/audio/easytag:128123-128225
</span><span class="cx">   + /branches/mld-qt-481/dports/audio/easytag:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/audio/easytag:128123-128297
</span><a id="usersdevansGNOME3stabledportsaudioeasytagPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/audio/easytag/Portfile (128297 => 128298)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/audio/easytag/Portfile        2014-11-18 18:30:01 UTC (rev 128297)
+++ users/devans/GNOME-3/stable/dports/audio/easytag/Portfile        2014-11-18 18:35:26 UTC (rev 128298)
</span><span class="lines">@@ -1,52 +1,51 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><span class="cx"> 
</span><del>-PortSystem      1.0
</del><ins>+PortSystem          1.0
</ins><span class="cx"> 
</span><del>-name            easytag
-version         2.2.4
-revision        2
-set branch      [join [lrange [split ${version} .] 0 1] .]
-categories      audio gnome
-platforms       darwin
-maintainers     nomaintainer
-homepage        https://wiki.gnome.org/Apps/EasyTAG/
-license         GPL-2+
-description     Tool for editing tags of audio files
</del><ins>+name                easytag
+version             2.2.4
+revision            2
+set branch          [join [lrange [split ${version} .] 0 1] .]
+categories          audio gnome
+platforms           darwin
+maintainers         devans openmaintainer
+homepage            https://wiki.gnome.org/Apps/EasyTAG/
+license             GPL-2+
+description         Tool for editing tags of audio files
</ins><span class="cx"> 
</span><del>-long_description \
-                EasyTAG is an utility for viewing and editing tags \
-                for MP3, MP2, FLAC, Ogg Vorbis, MusePack, Monkey's \
-                audio files and MP4/AAC. \
-                Its simple and nice GTK2+ interface makes tagging easier \
-                under UNIX systems.
</del><ins>+long_description    EasyTAG is an utility for viewing and editing tags \
+                    for MP3, MP2, FLAC, Ogg Vorbis, MusePack, Monkey's \
+                    audio files and MP4/AAC. \
+                    Its simple and nice GTK2+ interface makes tagging easier \
+                    under UNIX systems.
</ins><span class="cx"> 
</span><del>-master_sites    gnome:sources/${name}/${branch}
</del><ins>+master_sites        gnome:sources/${name}/${branch}
</ins><span class="cx"> 
</span><del>-checksums       rmd160  21f7931bc1a9e7a09630163f6b713b7c72ea2b80 \
-                sha256  458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091
</del><ins>+checksums           rmd160  21f7931bc1a9e7a09630163f6b713b7c72ea2b80 \
+                    sha256  458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091
</ins><span class="cx"> 
</span><del>-use_xz          yes
</del><ins>+use_xz              yes
</ins><span class="cx"> 
</span><del>-depends_build   port:pkgconfig \
-                port:intltool \
-                port:itstool \
-                port:yelp-tools \
-                port:appstream-glib
</del><ins>+depends_build       port:pkgconfig \
+                    port:intltool \
+                    port:itstool \
+                    port:yelp-tools \
+                    port:appstream-glib
</ins><span class="cx"> 
</span><del>-depends_lib     port:desktop-file-utils \
-                port:gtk3 \
-                port:libvorbis \
-                port:flac \
-                port:id3lib \
-                port:libid3tag \
-                port:speex \
-                port:libopus \
-                port:opusfile \
-                port:taglib \
-                port:wavpack
</del><ins>+depends_lib         port:desktop-file-utils \
+                    port:gtk3 \
+                    port:libvorbis \
+                    port:flac \
+                    port:id3lib \
+                    port:libid3tag \
+                    port:speex \
+                    port:libopus \
+                    port:opusfile \
+                    port:taglib \
+                    port:wavpack
</ins><span class="cx"> 
</span><del>-depends_run     port:gnome-themes-standard
</del><ins>+depends_run         port:gnome-themes-standard
</ins><span class="cx"> 
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx"> 
</span><span class="lines">@@ -54,17 +53,17 @@
</span><span class="cx">     copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-use_autoreconf  yes
-autoreconf.args -fvi
</del><ins>+use_autoreconf      yes
+autoreconf.args     -fvi
</ins><span class="cx"> 
</span><del>-configure.args  --with-gtk2=no
</del><ins>+configure.args      --with-gtk2=no
</ins><span class="cx"> 
</span><span class="cx"> configure.cxxflags-append \
</span><del>-                -Wno-format-nonliteral
</del><ins>+                    -Wno-format-nonliteral
</ins><span class="cx"> 
</span><span class="cx"> post-activate {
</span><span class="cx">     system &quot;${prefix}/bin/update-desktop-database ${prefix}/share/applications&quot;
</span><span class="cx">     system &quot;${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor&quot;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-livecheck.type  gnome-with-unstable
</del><ins>+livecheck.type      gnome
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/devel/glib2</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/glib2:52045-52046,62644,64476,72697,91791,125620-128108
</span><span class="cx">/trunk/dports/devel/glib2-devel:51739-120463
</span><span class="cx">/users/cal/ports/devel/glib2:96570-97031
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619
</span><span class="cx">   + /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791,125620-128290
</span><span class="cx">/trunk/dports/devel/glib2-devel:51739-120463
</span><span class="cx">/users/cal/ports/devel/glib2:96570-97031
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619
</span><a id="usersdevansGNOME3stabledportsdevelglib2Portfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/Portfile (128297 => 128298)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile        2014-11-18 18:30:01 UTC (rev 128297)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile        2014-11-18 18:35:26 UTC (rev 128298)
</span><span class="lines">@@ -43,9 +43,11 @@
</span><span class="cx">                             patch-gio_xdgmime_xdgmime.c.diff \
</span><span class="cx">                             patch-gio_gdbusprivate.c.diff \
</span><span class="cx">                             patch-get-launchd-dbus-session-address.diff \
</span><del>-                            patch-gmodule-gmodule-dl.c.diff \
-                            yosemite-symbol-lookup.patch
</del><ins>+                            patch-gmodule-gmodule-dl.c.diff
</ins><span class="cx"> 
</span><ins>+# Don't link with &quot;-flat_namespace -undefined suppress&quot; on Yosemite and later.
+patchfiles-append           yosemite-libtool.patch
+
</ins><span class="cx"> depends_build               bin:xmllint:libxml2
</span><span class="cx"> 
</span><span class="cx"> depends_lib                 port:gettext \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filesyosemitelibtoolpatchfromrev128290trunkdportsdevelglib2filesyosemitelibtoolpatch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch (from rev 128290, trunk/dports/devel/glib2/files/yosemite-libtool.patch) (0 => 128298)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch                                (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch        2014-11-18 18:35:26 UTC (rev 128298)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -11742,7 +11742,7 @@ $as_echo &quot;$lt_cv_ld_force_load&quot; &gt;&amp;6; }
+       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+         10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+           _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+-        10.[012]*)
++        10.[012][,.]*)
+           _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+         10.*)
+           _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filesyosemitesymbollookuppatch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch (128297 => 128298)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch        2014-11-18 18:30:01 UTC (rev 128297)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch        2014-11-18 18:35:26 UTC (rev 128298)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -11742,7 +11742,7 @@ $as_echo &quot;$lt_cv_ld_force_load&quot; &gt;&amp;6; }
-       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-         10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-           _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--        10.[012]*)
-+        10.[012][,.]*)
-           _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-         10.*)
-           _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</del></span></pre>
</div>
</div>

</body>
</html>