<!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>[134567] 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/134567">134567</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-03-30 06:39:25 -0700 (Mon, 30 Mar 2015)</dd>
</dl>

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdevelglib2filespatchconfigurediff">users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff</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-134372
</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-134566
</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="usersdevansGNOME3stabledportsdevelglib2filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff (134566 => 134567)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff        2015-03-30 13:16:44 UTC (rev 134566)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff        2015-03-30 13:39:25 UTC (rev 134567)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig        2013-04-30 23:17:08.000000000 -0500
-+++ configure        2013-05-05 00:59:06.000000000 -0500
-@@ -5757,7 +5757,7 @@
</del><ins>+--- configure.orig        2015-03-02 10:57:11.000000000 -0600
++++ configure        2015-03-06 03:15:18.000000000 -0600
+@@ -6086,7 +6086,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,17 @@
</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>-@@ -30613,10 +30613,10 @@
</del><ins>+@@ -22240,9 +22240,6 @@
+  presetting ac_cv_c_bigendian=no (or yes) will help&quot; &quot;$LINENO&quot; 5 ;;
+  esac

+-if test x$ac_cv_c_bigendian = xuniversal ; then
+-  as_fn_error $? &quot;Universal builds not supported: see https://bugs.gnome.org/742548&quot; &quot;$LINENO&quot; 5
+-fi


+ # check for header files
+@@ -30464,10 +30461,10 @@
</ins><span class="cx">  *)                        glib_vacopy=''
</span><span class="cx">  esac
</span><span class="cx">  
</span><span class="lines">@@ -23,7 +33,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>-@@ -32380,18 +32380,32 @@
</del><ins>+@@ -32224,18 +32221,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">@@ -63,7 +73,7 @@
</span><span class="cx">  _______EOF
</span><span class="cx">          else
</span><span class="cx">            cat &gt;&gt;$outfile &lt;&lt;_______EOF
</span><del>-@@ -32403,10 +32417,17 @@
</del><ins>+@@ -32247,10 +32258,17 @@
</ins><span class="cx">  
</span><span class="cx">          cat &gt;&gt;$outfile &lt;&lt;_______EOF
</span><span class="cx">  
</span><span class="lines">@@ -85,7 +95,7 @@
</span><span class="cx">  
</span><span class="cx">  _______EOF
</span><span class="cx">  
</span><del>-@@ -32435,18 +32456,33 @@
</del><ins>+@@ -32279,18 +32297,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">@@ -128,7 +138,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>-@@ -32559,7 +32595,9 @@
</del><ins>+@@ -32405,7 +32438,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">@@ -138,7 +148,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>-@@ -32569,27 +32607,52 @@
</del><ins>+@@ -32415,27 +32450,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>
</div>

</body>
</html>