<!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>[141255] users/devans/GNOME-3/stable/dports/devel/glib2</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/141255">141255</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-13 12:43:41 -0700 (Tue, 13 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>GNOME-3/stable: glib2, merge changes from trunk, realign/restore get-launchd-dbus-session-address patch to avoid startup failures with apps that use glib2 to access the dbus session bus, increment revision.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2Portfile">users/devans/GNOME-3/stable/dports/devel/glib2/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchconfigurediff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchgetlaunchddbussessionaddressdiff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchgi18nhdiff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchgio_gdbusprivatecdiff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchgio_xdgmime_xdgmimecdiff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchglibgmaincdiff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchglib_gunicollatecdiff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filesremovegcocoanotificationbackendunusedpatch">users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filesremovegcocoanotificationbackendpatch">users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch</a></li>
</ul>

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

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

</div>
<div id="patch">
<h3>Diff</h3>
<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-140962
</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:125620-141254
</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,128305-141254
</span><a id="usersdevansGNOME3stabledportsdevelglib2Portfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/Portfile (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -10,12 +10,8 @@
</span><span class="cx"> name                        glib2
</span><span class="cx"> conflicts                   glib2-devel
</span><span class="cx"> set my_name                 glib
</span><del>-# Don't upgrade to 2.45.3 or newer because it requires OS X 10.9 or later.
-# Discussing what to do about this:
-# https://mail.gnome.org/archives/gtk-devel-list/2015-September/msg00025.html
-# https://bugzilla.gnome.org/show_bug.cgi?id=747146
-version                     2.44.1
-revision                    1
</del><ins>+version                     2.46.0
+revision                    2
</ins><span class="cx"> set branch                  [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories                  devel
</span><span class="cx"> maintainers                 ryandesign openmaintainer
</span><span class="lines">@@ -35,8 +31,8 @@
</span><span class="cx"> 
</span><span class="cx"> master_sites                gnome:sources/${my_name}/${branch}/
</span><span class="cx"> 
</span><del>-checksums                   rmd160  40db36e25c4baf5bdcdde34379d4968e9b35557c \
-                            sha256  8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07
</del><ins>+checksums                   rmd160  dafbe7195a2171f1201570d20912c6a4ead23201 \
+                            sha256  b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4
</ins><span class="cx"> 
</span><span class="cx"> # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
</span><span class="cx"> # See https://trac.macports.org/changeset/27148
</span><span class="lines">@@ -50,8 +46,10 @@
</span><span class="cx">                             patch-get-launchd-dbus-session-address.diff \
</span><span class="cx">                             patch-gmodule-gmodule-dl.c.diff
</span><span class="cx"> 
</span><del>-# Don't link with &quot;-flat_namespace -undefined suppress&quot; on Yosemite and later.
-patchfiles-append           yosemite-libtool.patch
</del><ins>+if {[vercmp ${macosx_deployment_target} 10.9] &lt; 0} {
+    # gcocoanotificationbackend requires OS X 10.9 or later.
+    patchfiles-append       remove-gcocoanotificationbackend.patch
+}
</ins><span class="cx"> 
</span><span class="cx"> depends_build               bin:xmllint:libxml2
</span><span class="cx"> 
</span><span class="lines">@@ -107,7 +105,7 @@
</span><span class="cx"> test.target                 check
</span><span class="cx"> 
</span><span class="cx"> post-destroot {
</span><del>-    file delete ${destroot}${prefix}/lib/charset.alias
</del><ins>+    delete ${destroot}${prefix}/lib/charset.alias
</ins><span class="cx"> 
</span><span class="cx">     set docdir ${prefix}/share/doc/${my_name}
</span><span class="cx">     xinstall -d ${destroot}${docdir}
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig        2015-03-02 10:57:11.000000000 -0600
-+++ configure        2015-03-06 03:15:18.000000000 -0600
-@@ -6086,7 +6086,7 @@
</del><ins>+--- configure.orig        2015-07-20 14:45:59.000000000 -0700
++++ configure        2015-07-20 17:27:32.000000000 -0700
+@@ -6176,7 +6176,7 @@
</ins><span class="cx">  fi
</span><span class="cx">  
</span><span class="cx">  GLIB_RUNTIME_LIBDIR=&quot;$with_runtime_libdir&quot;
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">  
</span><span class="cx">  
</span><span class="cx">   if test &quot;x$with_runtime_libdir&quot; != &quot;x&quot;; then
</span><del>-@@ -22240,9 +22240,6 @@
</del><ins>+@@ -22842,9 +22842,6 @@
</ins><span class="cx">   presetting ac_cv_c_bigendian=no (or yes) will help&quot; &quot;$LINENO&quot; 5 ;;
</span><span class="cx">   esac
</span><span class="cx">  
</span><span class="lines">@@ -19,7 +19,16 @@
</span><span class="cx">  
</span><span class="cx">  
</span><span class="cx">  # check for header files
</span><del>-@@ -30464,10 +30461,10 @@
</del><ins>+@@ -29489,7 +29486,7 @@

+   for flag in \
+    -Wall -Wstrict-prototypes -Werror=declaration-after-statement \
+-   -Werror=missing-prototypes -Werror=implicit-function-declaration \
++    -Werror=implicit-function-declaration \
+    -Werror=pointer-arith -Werror=init-self -Werror=format-security \
+    -Werror=format=2 -Werror=missing-include-dirs; do

+@@ -31042,10 +31039,10 @@
</ins><span class="cx">  *)                        glib_vacopy=''
</span><span class="cx">  esac
</span><span class="cx">  
</span><span class="lines">@@ -33,7 +42,7 @@
</span><span class="cx">  
</span><span class="cx">  if test x$glib_cv_hasinline = xyes; then
</span><span class="cx">      glib_inline='#define G_HAVE_INLINE 1'
</span><del>-@@ -32224,18 +32221,32 @@
</del><ins>+@@ -32714,18 +32711,32 @@
</ins><span class="cx">          cat &gt;&gt;$outfile &lt;&lt;_______EOF
</span><span class="cx">  #define G_HAVE_GINT64 1          /* deprecated, always true */
</span><span class="cx">  
</span><span class="lines">@@ -73,7 +82,7 @@
</span><span class="cx">  _______EOF
</span><span class="cx">          else
</span><span class="cx">            cat &gt;&gt;$outfile &lt;&lt;_______EOF
</span><del>-@@ -32247,10 +32258,17 @@
</del><ins>+@@ -32737,10 +32748,17 @@
</ins><span class="cx">  
</span><span class="cx">          cat &gt;&gt;$outfile &lt;&lt;_______EOF
</span><span class="cx">  
</span><span class="lines">@@ -95,7 +104,7 @@
</span><span class="cx">  
</span><span class="cx">  _______EOF
</span><span class="cx">  
</span><del>-@@ -32279,18 +32297,33 @@
</del><ins>+@@ -32769,18 +32787,33 @@
</ins><span class="cx">          if test -z &quot;$glib_unknown_void_p&quot;; then
</span><span class="cx">            cat &gt;&gt;$outfile &lt;&lt;_______EOF
</span><span class="cx">  
</span><span class="lines">@@ -138,7 +147,7 @@
</span><span class="cx">  _______EOF
</span><span class="cx">          else
</span><span class="cx">            echo '#error SIZEOF_VOID_P unknown - This should never happen' &gt;&gt;$outfile
</span><del>-@@ -32405,7 +32438,9 @@
</del><ins>+@@ -32895,7 +32928,9 @@
</ins><span class="cx">  
</span><span class="cx">          if test x&quot;$g_memory_barrier_needed&quot; != xno; then
</span><span class="cx">            echo &gt;&gt;$outfile
</span><span class="lines">@@ -148,7 +157,7 @@
</span><span class="cx">          fi
</span><span class="cx">          if test x&quot;$g_atomic_lock_free&quot; = xyes; then
</span><span class="cx">            echo &gt;&gt;$outfile
</span><del>-@@ -32415,27 +32450,52 @@
</del><ins>+@@ -32905,27 +32940,52 @@
</ins><span class="cx">          g_bit_sizes=&quot;16 32 64&quot;
</span><span class="cx">          for bits in $g_bit_sizes; do
</span><span class="cx">            cat &gt;&gt;$outfile &lt;&lt;_______EOF
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filespatchgetlaunchddbussessionaddressdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- gio/gdbusaddress.c.orig        2013-05-27 10:01:46.000000000 -0700
-+++ gio/gdbusaddress.c        2013-06-13 22:48:22.000000000 -0700
-@@ -1426,13 +1426,116 @@
</del><ins>+--- gio/gdbusaddress.c.orig        2015-06-09 16:18:38.000000000 -0700
++++ gio/gdbusaddress.c        2015-06-23 10:54:28.000000000 -0700
+@@ -1475,6 +1475,103 @@
</ins><span class="cx">  
</span><span class="cx">  /* ---------------------------------------------------------------------------------------------------- */
</span><span class="cx">  
</span><span class="lines">@@ -104,16 +104,16 @@
</span><span class="cx">  static gchar *
</span><span class="cx">  get_session_address_platform_specific (GError **error)
</span><span class="cx">  {
</span><del>-   gchar *ret;
- #if defined (G_OS_UNIX) || defined(G_OS_WIN32)
-   /* need to handle OS X in a different way since 'dbus-launch --autolaunch' probably won't work there */
</del><ins>+@@ -1503,7 +1600,12 @@
+    * X11 autolaunching; on Windows this means a different autolaunching
+    * mechanism based on shared memory.
+    */
</ins><span class="cx"> +
</span><span class="cx"> +#ifdef __APPLE__
</span><del>-+  ret = get_session_address_macports_specific (error);
</del><ins>++  return get_session_address_macports_specific (error);
</ins><span class="cx"> +#else
</span><del>-   ret = get_session_address_dbus_launch (error);
</del><ins>+   return get_session_address_dbus_launch (error);
</ins><span class="cx"> +#endif
</span><del>-+
- #else
-   /* TODO: implement for OS X */
-   ret = NULL;
</del><ins>+ }

+ /* ---------------------------------------------------------------------------------------------------- */
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filespatchgi18nhdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- glib/gi18n.h.orig        2008-11-23 23:45:23.000000000 -0600
-+++ glib/gi18n.h        2008-11-25 23:59:29.000000000 -0600
-@@ -27,7 +27,9 @@
</del><ins>+--- glib/gi18n.h.orig        2014-12-19 13:49:48.000000000 -0800
++++ glib/gi18n.h        2015-07-20 17:28:35.000000000 -0700
+@@ -25,7 +25,9 @@
</ins><span class="cx">  
</span><span class="cx">  #define  _(String) gettext (String)
</span><span class="cx">  #define Q_(String) g_dpgettext (NULL, String, 0)
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filespatchgio_gdbusprivatecdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -1,20 +1,20 @@
</span><del>---- gio/gdbusprivate.c.orig        2012-11-16 17:01:40.000000000 -0600
-+++ gio/gdbusprivate.c        2013-01-15 23:21:22.000000000 -0600
-@@ -2100,7 +2100,7 @@
</del><ins>+--- gio/gdbusprivate.c.orig        2015-05-22 14:01:27.000000000 -0700
++++ gio/gdbusprivate.c        2015-07-20 17:28:35.000000000 -0700
+@@ -2068,7 +2068,7 @@
</ins><span class="cx">    /* TODO: use PACKAGE_LOCALSTATEDIR ? */
</span><span class="cx">    ret = NULL;
</span><span class="cx">    first_error = NULL;
</span><span class="cx"> -  if (!g_file_get_contents (&quot;/var/lib/dbus/machine-id&quot;,
</span><del>-+  if (!g_file_get_contents (&quot;@@PREFIX@@/var/lib/dbus/machine-id&quot;,
</del><ins>++  if (!g_file_get_contents (&quot;/opt/local/var/lib/dbus/machine-id&quot;,
</ins><span class="cx">                              &amp;ret,
</span><span class="cx">                              NULL,
</span><span class="cx">                              &amp;first_error) &amp;&amp;
</span><del>-@@ -2110,7 +2110,7 @@
</del><ins>+@@ -2078,7 +2078,7 @@
</ins><span class="cx">                              NULL))
</span><span class="cx">      {
</span><span class="cx">        g_propagate_prefixed_error (error, first_error,
</span><span class="cx"> -                                  _(&quot;Unable to load /var/lib/dbus/machine-id or /etc/machine-id: &quot;));
</span><del>-+                                  _(&quot;Unable to load @@PREFIX@@/var/lib/dbus/machine-id or /etc/machine-id: &quot;));
</del><ins>++                                  _(&quot;Unable to load /opt/local/var/lib/dbus/machine-id or /etc/machine-id: &quot;));
</ins><span class="cx">      }
</span><span class="cx">    else
</span><span class="cx">      {
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filespatchgio_xdgmime_xdgmimecdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- gio/xdgmime/xdgmime.c.orig        2009-03-12 22:09:52.000000000 -0600
-+++ gio/xdgmime/xdgmime.c        2009-04-09 23:41:01.000000000 -0600
-@@ -257,7 +257,7 @@
</del><ins>+--- gio/xdgmime/xdgmime.c.orig        2014-12-19 13:49:48.000000000 -0800
++++ gio/xdgmime/xdgmime.c        2015-07-20 17:28:35.000000000 -0700
+@@ -255,7 +255,7 @@
</ins><span class="cx">  
</span><span class="cx">    xdg_data_dirs = getenv (&quot;XDG_DATA_DIRS&quot;);
</span><span class="cx">    if (xdg_data_dirs == NULL)
</span><span class="cx"> -    xdg_data_dirs = &quot;/usr/local/share/:/usr/share/&quot;;
</span><del>-+    xdg_data_dirs = &quot;@@PREFIX@@/share/:/usr/share/&quot;;
</del><ins>++    xdg_data_dirs = &quot;/opt/local/share/:/usr/share/&quot;;
</ins><span class="cx">  
</span><span class="cx">    ptr = xdg_data_dirs;
</span><span class="cx">  
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filespatchglibgmaincdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -1,9 +1,6 @@
</span><del>-Fix g_get_monotonic_time on non-Intel processors
-https://bugzilla.gnome.org/show_bug.cgi?id=728123
-https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
---- glib/gmain.c.orig
-+++ glib/gmain.c
-@@ -2648,46 +2648,34 @@ gint64
</del><ins>+--- glib/gmain.c.orig        2015-05-22 14:01:27.000000000 -0700
++++ glib/gmain.c        2015-07-20 17:28:35.000000000 -0700
+@@ -2706,46 +2706,34 @@
</ins><span class="cx">  g_get_monotonic_time (void)
</span><span class="cx">  {
</span><span class="cx">    static mach_timebase_info_data_t timebase_info;
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filespatchglib_gunicollatecdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- glib/gunicollate.c.orig        2009-03-31 18:04:20.000000000 -0500
-+++ glib/gunicollate.c        2010-03-06 17:59:08.000000000 -0600
-@@ -26,6 +26,9 @@
</del><ins>+--- glib/gunicollate.c.orig        2014-12-19 13:49:48.000000000 -0800
++++ glib/gunicollate.c        2015-07-20 17:28:35.000000000 -0700
+@@ -25,6 +25,9 @@
</ins><span class="cx">  #include &lt;wchar.h&gt;
</span><span class="cx">  #endif
</span><span class="cx">  
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filesremovegcocoanotificationbackendunusedpatchfromrev141254trunkdportsdevelglib2filesremovegcocoanotificationbackendunusedpatch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch (from rev 141254, trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch) (0 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch                                (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
+These patches to configure.ac and gio/Makefile.am are not used by the port but are
+used by the maintainer to regenerate the patches to configure and gio/Makefile.in
+that are used by the port.
+--- configure.ac.orig        2015-09-21 07:38:33.000000000 -0500
++++ configure.ac        2015-10-10 18:32:37.000000000 -0500
+@@ -223,15 +223,6 @@
+   AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+   COCOA_LIBS=&quot;-Wl,-framework,Foundation&quot;
+   LDFLAGS=&quot;$LDFLAGS $COCOA_LIBS&quot;
+-
+-  osx_version=`sw_vers -productVersion`
+-  osx_min_version=&quot;10.9.0&quot;
+-  AC_MSG_CHECKING([OSX version &gt;= $osx_min_version])
+-  AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
+-    AC_MSG_RESULT([no])
+-    AC_MSG_ERROR([OSX version is too old!])
+-  ])
+-  AC_MSG_RESULT([yes])
+ ], [COCOA_LIBS=&quot;&quot;])

+ AC_SUBST([COCOA_LIBS])
+--- gio/Makefile.am.orig        2015-09-04 12:56:56.000000000 -0500
++++ gio/Makefile.am        2015-10-10 18:32:38.000000000 -0500
+@@ -265,9 +265,6 @@
+         ggtknotificationbackend.c \
+         $(NULL)

+-if OS_COCOA
+-unix_sources += gcocoanotificationbackend.c
+-endif

+ giounixincludedir=$(includedir)/gio-unix-2.0/gio
+ giounixinclude_HEADERS = \
+@@ -527,7 +524,7 @@
+ if OS_COCOA
+ # This is dumb.  The ObjC source file should be properly named .m
+ libgio_2_0_la_CFLAGS += -xobjective-c
+-libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,AppKit
++libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
+ endif

+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filesremovegcocoanotificationbackendpatchfromrev141254trunkdportsdevelglib2filesremovegcocoanotificationbackendpatch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch (from rev 141254, trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch) (0 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch                                (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch        2015-10-13 19:43:41 UTC (rev 141255)
</span><span class="lines">@@ -0,0 +1,269 @@
</span><ins>+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
+--- configure.orig        2015-09-21 07:39:10.000000000 -0500
++++ configure        2015-10-10 18:33:12.000000000 -0500
+@@ -6029,30 +5969,6 @@
+   COCOA_LIBS=&quot;-Wl,-framework,Foundation&quot;
+   LDFLAGS=&quot;$LDFLAGS $COCOA_LIBS&quot;

+-  osx_version=`sw_vers -productVersion`
+-  osx_min_version=&quot;10.9.0&quot;
+-  { $as_echo &quot;$as_me:${as_lineno-$LINENO}: checking OSX version &gt;= $osx_min_version&quot; &gt;&amp;5
+-$as_echo_n &quot;checking OSX version &gt;= $osx_min_version... &quot; &gt;&amp;6; }
+-  as_arg_v1=$osx_version
+-as_arg_v2=$osx_min_version
+-awk &quot;$as_awk_strverscmp&quot; v1=&quot;$as_arg_v1&quot; v2=&quot;$as_arg_v2&quot; /dev/null
+-case $? in #(
+-  1) :
+-
+-    { $as_echo &quot;$as_me:${as_lineno-$LINENO}: result: no&quot; &gt;&amp;5
+-$as_echo &quot;no&quot; &gt;&amp;6; }
+-    as_fn_error $? &quot;OSX version is too old!&quot; &quot;$LINENO&quot; 5
+-   ;; #(
+-  0) :
+-     ;; #(
+-  2) :
+-     ;; #(
+-  *) :
+-     ;;
+-esac
+-  { $as_echo &quot;$as_me:${as_lineno-$LINENO}: result: yes&quot; &gt;&amp;5
+-$as_echo &quot;yes&quot; &gt;&amp;6; }
+-
+ else
+   COCOA_LIBS=&quot;&quot;
+ fi
+--- gio/Makefile.in.orig        2015-09-21 07:39:06.000000000 -0500
++++ gio/Makefile.in        2015-10-10 18:33:18.000000000 -0500
+@@ -181,27 +181,26 @@
+ @OS_UNIX_TRUE@am__append_29 = gdesktopappinfo.c
+ @OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
+ @OS_UNIX_TRUE@am__append_31 = xdgmime/libxdgmime.la
+-@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
+-@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
++@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_32 = \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@        gnetworkmonitornetlink.c \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@        gnetworkmonitornetlink.h \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@        gnetworkmonitornm.c         \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@        gnetworkmonitornm.h         \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@        $(NULL)

+-@OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
+-@OS_WIN32_TRUE@am__append_35 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
++@OS_WIN32_TRUE@am__append_33 = gwin32appinfo.c gwin32appinfo.h
++@OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi

+ # This is dumb.  The ObjC source file should be properly named .m
+-@OS_COCOA_TRUE@am__append_36 = -xobjective-c
+-@OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
++@OS_COCOA_TRUE@am__append_35 = -xobjective-c
++@OS_COCOA_TRUE@am__append_36 = -Wl,-framework,Foundation
+ bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
+         glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
+         gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT)

+ # ------------------------------------------------------------------------
+ # gapplication(1) tool
+-@OS_UNIX_TRUE@am__append_38 = gapplication
++@OS_UNIX_TRUE@am__append_37 = gapplication
+ subdir = gio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
+@@ -317,17 +316,17 @@
+         gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
+         gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
+         gcontenttype.c gcontenttypeprivate.h gfdonotificationbackend.c \
+-        ggtknotificationbackend.c gcocoanotificationbackend.c \
+-        gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
+-        gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
+-        gdbusdaemon.h gdbus-daemon-generated.c \
+-        gdbus-daemon-generated.h gwin32registrykey.c \
+-        gwin32registrykey.h gcontenttype-win32.c gwin32mount.c \
+-        gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
+-        gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
+-        gwin32networking.h gapplication.c gapplicationcommandline.c \
+-        gapplicationimpl-dbus.c gapplicationimpl.h gactiongroup.c \
+-        gactionmap.c gsimpleactiongroup.c gremoteactiongroup.c \
++        ggtknotificationbackend.c gnetworkmonitornetlink.c \
++        gnetworkmonitornetlink.h gnetworkmonitornm.c \
++        gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
++        gdbus-daemon-generated.c gdbus-daemon-generated.h \
++        gwin32registrykey.c gwin32registrykey.h gcontenttype-win32.c \
++        gwin32mount.c gwin32mount.h gwin32volumemonitor.c \
++        gwin32volumemonitor.h gwin32inputstream.c gwin32outputstream.c \
++        gwin32outputstream.h gwin32networking.h gapplication.c \
++        gapplicationcommandline.c gapplicationimpl-dbus.c \
++        gapplicationimpl.h gactiongroup.c gactionmap.c \
++        gsimpleactiongroup.c gremoteactiongroup.c \
+         gactiongroupexporter.c gdbusactiongroup-private.h \
+         gdbusactiongroup.c gaction.c gpropertyaction.c gsimpleaction.c \
+         gmenumodel.c gmenu.c gmenuexporter.c gdbusmenumodel.c \
+@@ -373,11 +372,10 @@
+ @OS_WIN32_TRUE@am__objects_2 = libgio_2_0_la-gwin32appinfo.lo
+ am__objects_3 = $(am__objects_1) $(am__objects_2)
+ am__objects_4 =
+-@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gcocoanotificationbackend.lo
+-@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gnetworkmonitornetlink.lo \
++@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gnetworkmonitornetlink.lo \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@        libgio_2_0_la-gnetworkmonitornm.lo \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@        $(am__objects_4)
+-@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gfiledescriptorbased.lo \
++@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gfiledescriptorbased.lo \
+ @OS_UNIX_TRUE@        libgio_2_0_la-gunixconnection.lo \
+ @OS_UNIX_TRUE@        libgio_2_0_la-gunixcredentialsmessage.lo \
+ @OS_UNIX_TRUE@        libgio_2_0_la-gunixfdlist.lo \
+@@ -392,18 +390,17 @@
+ @OS_UNIX_TRUE@        libgio_2_0_la-gcontenttype.lo \
+ @OS_UNIX_TRUE@        libgio_2_0_la-gfdonotificationbackend.lo \
+ @OS_UNIX_TRUE@        libgio_2_0_la-ggtknotificationbackend.lo \
+-@OS_UNIX_TRUE@        $(am__objects_4) $(am__objects_5) \
+-@OS_UNIX_TRUE@        $(am__objects_6)
+-am__objects_8 = libgio_2_0_la-gdbusdaemon.lo \
++@OS_UNIX_TRUE@        $(am__objects_4) $(am__objects_5)
++am__objects_7 = libgio_2_0_la-gdbusdaemon.lo \
+         libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_4)
+-am__objects_9 = $(am__objects_8) libgio_2_0_la-gwin32registrykey.lo \
++am__objects_8 = $(am__objects_7) libgio_2_0_la-gwin32registrykey.lo \
+         libgio_2_0_la-gcontenttype-win32.lo \
+         libgio_2_0_la-gwin32mount.lo \
+         libgio_2_0_la-gwin32volumemonitor.lo \
+         libgio_2_0_la-gwin32inputstream.lo \
+         libgio_2_0_la-gwin32outputstream.lo $(am__objects_4)
+-@OS_WIN32_TRUE@am__objects_10 = $(am__objects_9)
+-am__objects_11 = libgio_2_0_la-gapplication.lo \
++@OS_WIN32_TRUE@am__objects_9 = $(am__objects_8)
++am__objects_10 = libgio_2_0_la-gapplication.lo \
+         libgio_2_0_la-gapplicationcommandline.lo \
+         libgio_2_0_la-gapplicationimpl-dbus.lo \
+         libgio_2_0_la-gactiongroup.lo libgio_2_0_la-gactionmap.lo \
+@@ -416,11 +413,11 @@
+         libgio_2_0_la-gmenu.lo libgio_2_0_la-gmenuexporter.lo \
+         libgio_2_0_la-gdbusmenumodel.lo libgio_2_0_la-gnotification.lo \
+         libgio_2_0_la-gnotificationbackend.lo $(am__objects_4)
+-@OS_WIN32_TRUE@am__objects_12 =  \
++@OS_WIN32_TRUE@am__objects_11 =  \
+ @OS_WIN32_TRUE@        libgio_2_0_la-gregistrysettingsbackend.lo
+-@OS_COCOA_TRUE@am__objects_13 =  \
++@OS_COCOA_TRUE@am__objects_12 =  \
+ @OS_COCOA_TRUE@        libgio_2_0_la-gnextstepsettingsbackend.lo
+-am__objects_14 = libgio_2_0_la-gvdb-reader.lo \
++am__objects_13 = libgio_2_0_la-gvdb-reader.lo \
+         libgio_2_0_la-gdelayedsettingsbackend.lo \
+         libgio_2_0_la-gkeyfilesettingsbackend.lo \
+         libgio_2_0_la-gmemorysettingsbackend.lo \
+@@ -428,8 +425,8 @@
+         libgio_2_0_la-gsettingsbackend.lo \
+         libgio_2_0_la-gsettingsschema.lo \
+         libgio_2_0_la-gsettings-mapping.lo libgio_2_0_la-gsettings.lo \
+-        $(am__objects_12) $(am__objects_13)
+-am__objects_15 = libgio_2_0_la-gdbusutils.lo \
++        $(am__objects_11) $(am__objects_12)
++am__objects_14 = libgio_2_0_la-gdbusutils.lo \
+         libgio_2_0_la-gdbusaddress.lo \
+         libgio_2_0_la-gdbusauthobserver.lo libgio_2_0_la-gdbusauth.lo \
+         libgio_2_0_la-gdbusauthmechanism.lo \
+@@ -451,7 +448,7 @@
+         libgio_2_0_la-gdbusobjectmanagerclient.lo \
+         libgio_2_0_la-gdbusobjectmanagerserver.lo \
+         libgio_2_0_la-gtestdbus.lo $(am__objects_4)
+-am__objects_16 = libgio_2_0_la-ghttpproxy.lo \
++am__objects_15 = libgio_2_0_la-ghttpproxy.lo \
+         libgio_2_0_la-glocalfile.lo \
+         libgio_2_0_la-glocalfileenumerator.lo \
+         libgio_2_0_la-glocalfileinfo.lo \
+@@ -545,9 +542,9 @@
+         libgio_2_0_la-gzlibcompressor.lo \
+         libgio_2_0_la-gzlibdecompressor.lo \
+         libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
+-        libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_7) \
+-        $(am__objects_10) $(am__objects_11) $(am__objects_14) \
+-        $(am__objects_15) $(am__objects_16) $(am__objects_4)
++        libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_6) \
++        $(am__objects_9) $(am__objects_10) $(am__objects_13) \
++        $(am__objects_14) $(am__objects_15) $(am__objects_4)
+ libgio_2_0_la_OBJECTS = $(am_libgio_2_0_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -1416,10 +1413,10 @@
+         $(NULL)

+ platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
+-        $(am__append_30) $(am__append_35)
++        $(am__append_30) $(am__append_34)
+ platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
+         $(am__append_31)
+-appinfo_sources = $(am__append_29) $(am__append_34)
++appinfo_sources = $(am__append_29) $(am__append_33)
+ @OS_UNIX_TRUE@unix_sources = gfiledescriptorbased.c gunixconnection.c \
+ @OS_UNIX_TRUE@        gunixcredentialsmessage.c gunixfdlist.c \
+ @OS_UNIX_TRUE@        gunixfdmessage.c gunixmount.c gunixmount.h \
+@@ -1429,7 +1426,7 @@
+ @OS_UNIX_TRUE@        gunixoutputstream.c gcontenttype.c \
+ @OS_UNIX_TRUE@        gcontenttypeprivate.h gfdonotificationbackend.c \
+ @OS_UNIX_TRUE@        ggtknotificationbackend.c $(NULL) \
+-@OS_UNIX_TRUE@        $(am__append_32) $(am__append_33)
++@OS_UNIX_TRUE@        $(am__append_32)
+ @OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio
+ @OS_UNIX_TRUE@giounixinclude_HEADERS = \
+ @OS_UNIX_TRUE@        gdesktopappinfo.h        \
+@@ -1650,10 +1647,10 @@
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res = gio-win32-res.o
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res_ldflag = -Wl,$(gio_win32_res)
+ libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
+-        $(am__append_36)
++        $(am__append_35)
+ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) $(gio_win32_res_ldflag) \
+         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+-        -export-dynamic $(no_undefined) $(am__append_37)
++        -export-dynamic $(no_undefined) $(am__append_36)
+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+ gio_headers = \
+         gappinfo.h                 \
+@@ -2206,7 +2203,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo@am__quote@
+@@ -3324,13 +3320,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@        DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@        $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-ggtknotificationbackend.lo `test -f 'ggtknotificationbackend.c' || echo '$(srcdir)/'`ggtknotificationbackend.c

+-libgio_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
+-@am__fastdepCC_TRUE@        $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gcocoanotificationbackend.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
+-@am__fastdepCC_TRUE@        $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@        $(AM_V_CC)source='gcocoanotificationbackend.c' object='libgio_2_0_la-gcocoanotificationbackend.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@        DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@        $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
+-
+ libgio_2_0_la-gnetworkmonitornetlink.lo: gnetworkmonitornetlink.c
+ @am__fastdepCC_TRUE@        $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gnetworkmonitornetlink.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo -c -o libgio_2_0_la-gnetworkmonitornetlink.lo `test -f 'gnetworkmonitornetlink.c' || echo '$(srcdir)/'`gnetworkmonitornetlink.c
+ @am__fastdepCC_TRUE@        $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Plo
+--- gio/giomodule.c.orig        2015-08-18 22:35:30.000000000 -0500
++++ gio/giomodule.c        2015-10-10 18:32:39.000000000 -0500
+@@ -911,10 +911,6 @@
+ extern GType g_gtk_notification_backend_get_type (void);
+ #endif

+-#ifdef HAVE_COCOA
+-extern GType g_cocoa_notification_backend_get_type (void);
+-#endif
+-
+ #ifdef G_PLATFORM_WIN32

+ #include &lt;windows.h&gt;
+@@ -1088,9 +1084,6 @@
+       g_type_ensure (g_fdo_notification_backend_get_type ());
+       g_type_ensure (g_gtk_notification_backend_get_type ());
+ #endif
+-#ifdef HAVE_COCOA
+-      g_type_ensure (g_cocoa_notification_backend_get_type ());
+-#endif
+ #ifdef G_OS_WIN32
+       g_type_ensure (_g_winhttp_vfs_get_type ());
+ #endif
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelglib2filesyosemitelibtoolpatch"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch (141254 => 141255)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch        2015-10-13 17:36:05 UTC (rev 141254)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch        2015-10-13 19:43:41 UTC (rev 141255)
</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>