<!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>[120169] trunk/dports/devel</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/120169">120169</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-05-18 05:04:12 -0700 (Sun, 18 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>glib2, glib2-devel: fix g_get_monotonic_time on non-Intel processors (#43346)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2Portfile">trunk/dports/devel/glib2/Portfile</a></li>
<li><a href="#trunkdportsdevelglib2develPortfile">trunk/dports/devel/glib2-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2filespatchglibgmaincdiff">trunk/dports/devel/glib2/files/patch-glib-gmain.c.diff</a></li>
<li><a href="#trunkdportsdevelglib2develfilespatchglibgmaincdiff">trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelglib2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/glib2/Portfile (120168 => 120169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2/Portfile 2014-05-18 06:03:17 UTC (rev 120168)
+++ trunk/dports/devel/glib2/Portfile 2014-05-18 12:04:12 UTC (rev 120169)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> conflicts glib2-devel
</span><span class="cx"> set my_name glib
</span><span class="cx"> version 2.40.0
</span><ins>+revision 1
</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">@@ -38,6 +39,7 @@
</span><span class="cx"> # See https://trac.macports.org/changeset/27148
</span><span class="cx"> patchfiles patch-configure.diff \
</span><span class="cx"> patch-glib-2.0.pc.in.diff \
</span><ins>+ patch-glib-gmain.c.diff \
</ins><span class="cx"> patch-glib_gunicollate.c.diff \
</span><span class="cx"> patch-gi18n.h.diff \
</span><span class="cx"> patch-gio_xdgmime_xdgmime.c.diff \
</span></span></pre></div>
<a id="trunkdportsdevelglib2filespatchglibgmaincdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/glib2/files/patch-glib-gmain.c.diff (0 => 120169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2/files/patch-glib-gmain.c.diff (rev 0)
+++ trunk/dports/devel/glib2/files/patch-glib-gmain.c.diff 2014-05-18 12:04:12 UTC (rev 120169)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+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
+ g_get_monotonic_time (void)
+ {
+ static mach_timebase_info_data_t timebase_info;
++ static double absolute_to_micro;
+
+ if (timebase_info.denom == 0)
+ {
+- /* This is a fraction that we must use to scale
+- * mach_absolute_time() by in order to reach nanoseconds.
+- *
+- * We've only ever observed this to be 1/1, but maybe it could be
+- * 1000/1 if mach time is microseconds already, or 1/1000 if
+- * picoseconds. Try to deal nicely with that.
++ /* mach_absolute_time() returns "absolute time units", rather than
++ seconds; the mach_timebase_info_data_t struct provides a
++ fraction that can be used to convert these units into seconds.
+ */
+ mach_timebase_info (&timebase_info);
+-
+- /* We actually want microseconds... */
+- if (timebase_info.numer % 1000 == 0)
+- timebase_info.numer /= 1000;
+- else
+- timebase_info.denom *= 1000;
+-
+- /* We want to make the numer 1 to avoid having to multiply... */
+- if (timebase_info.denom % timebase_info.numer == 0)
+- {
+- timebase_info.denom /= timebase_info.numer;
+- timebase_info.numer = 1;
+- }
+- else
+- {
+- /* We could just multiply by timebase_info.numer below, but why
+- * bother for a case that may never actually exist...
+- *
+- * Plus -- performing the multiplication would risk integer
+- * overflow. If we ever actually end up in this situation, we
+- * should more carefully evaluate the correct course of action.
+- */
+- mach_timebase_info (&timebase_info); /* Get a fresh copy for a better message */
+- g_error ("Got weird mach timebase info of %d/%d. Please file a bug against GLib.",
+- timebase_info.numer, timebase_info.denom);
+- }
++ absolute_to_micro = 1e-3 * timebase_info.numer / timebase_info.denom;
+ }
+
+- return mach_absolute_time () / timebase_info.denom;
++ if (timebase_info.denom == 1 && timebase_info.numer == 1)
++ {
++ /* On Intel, the fraction has been 1/1 to date, so we can shortcut
++ the conversion into microseconds.
++ */
++ return mach_absolute_time () / 1000;
++ }
++ else
++ {
++ /* On ARM and PowerPC, the value is unpredictable and is hardware
++ dependent, so we can't guess. Both the units and numer/denom
++ are extremely large, so the conversion number is stored as a
++ double in order to avoid integer overflow.
++ */
++ return mach_absolute_time () * absolute_to_micro;
++ }
+ }
+ #else
+ gint64
</ins></span></pre></div>
<a id="trunkdportsdevelglib2develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/glib2-devel/Portfile (120168 => 120169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2-devel/Portfile 2014-05-18 06:03:17 UTC (rev 120168)
+++ trunk/dports/devel/glib2-devel/Portfile 2014-05-18 12:04:12 UTC (rev 120169)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> conflicts glib2
</span><span class="cx"> set my_name glib
</span><span class="cx"> version 2.40.0
</span><ins>+revision 1
</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">@@ -38,6 +39,7 @@
</span><span class="cx"> # See https://trac.macports.org/changeset/27148
</span><span class="cx"> patchfiles patch-configure.diff \
</span><span class="cx"> patch-glib-2.0.pc.in.diff \
</span><ins>+ patch-glib-gmain.c.diff \
</ins><span class="cx"> patch-glib_gunicollate.c.diff \
</span><span class="cx"> patch-gi18n.h.diff \
</span><span class="cx"> patch-gio_xdgmime_xdgmime.c.diff \
</span></span></pre></div>
<a id="trunkdportsdevelglib2develfilespatchglibgmaincdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff (0 => 120169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-glib-gmain.c.diff 2014-05-18 12:04:12 UTC (rev 120169)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+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
+ g_get_monotonic_time (void)
+ {
+ static mach_timebase_info_data_t timebase_info;
++ static double absolute_to_micro;
+
+ if (timebase_info.denom == 0)
+ {
+- /* This is a fraction that we must use to scale
+- * mach_absolute_time() by in order to reach nanoseconds.
+- *
+- * We've only ever observed this to be 1/1, but maybe it could be
+- * 1000/1 if mach time is microseconds already, or 1/1000 if
+- * picoseconds. Try to deal nicely with that.
++ /* mach_absolute_time() returns "absolute time units", rather than
++ seconds; the mach_timebase_info_data_t struct provides a
++ fraction that can be used to convert these units into seconds.
+ */
+ mach_timebase_info (&timebase_info);
+-
+- /* We actually want microseconds... */
+- if (timebase_info.numer % 1000 == 0)
+- timebase_info.numer /= 1000;
+- else
+- timebase_info.denom *= 1000;
+-
+- /* We want to make the numer 1 to avoid having to multiply... */
+- if (timebase_info.denom % timebase_info.numer == 0)
+- {
+- timebase_info.denom /= timebase_info.numer;
+- timebase_info.numer = 1;
+- }
+- else
+- {
+- /* We could just multiply by timebase_info.numer below, but why
+- * bother for a case that may never actually exist...
+- *
+- * Plus -- performing the multiplication would risk integer
+- * overflow. If we ever actually end up in this situation, we
+- * should more carefully evaluate the correct course of action.
+- */
+- mach_timebase_info (&timebase_info); /* Get a fresh copy for a better message */
+- g_error ("Got weird mach timebase info of %d/%d. Please file a bug against GLib.",
+- timebase_info.numer, timebase_info.denom);
+- }
++ absolute_to_micro = 1e-3 * timebase_info.numer / timebase_info.denom;
+ }
+
+- return mach_absolute_time () / timebase_info.denom;
++ if (timebase_info.denom == 1 && timebase_info.numer == 1)
++ {
++ /* On Intel, the fraction has been 1/1 to date, so we can shortcut
++ the conversion into microseconds.
++ */
++ return mach_absolute_time () / 1000;
++ }
++ else
++ {
++ /* On ARM and PowerPC, the value is unpredictable and is hardware
++ dependent, so we can't guess. Both the units and numer/denom
++ are extremely large, so the conversion number is stored as a
++ double in order to avoid integer overflow.
++ */
++ return mach_absolute_time () * absolute_to_micro;
++ }
+ }
+ #else
+ gint64
</ins></span></pre>
</div>
</div>
</body>
</html>