<!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>[141296] 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/141296">141296</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-14 16:13:46 -0700 (Wed, 14 Oct 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>
<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>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: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><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-141295
</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="usersdevansGNOME3stabledportsdevelglib2filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff (141295 => 141296)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff 2015-10-14 23:06:02 UTC (rev 141295)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-configure.diff 2015-10-14 23:13:46 UTC (rev 141296)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2015-07-20 14:45:59.000000000 -0700
-+++ configure 2015-07-20 17:27:32.000000000 -0700
-@@ -6176,7 +6176,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="$with_runtime_libdir"
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if test "x$with_runtime_libdir" != "x"; then
</span><del>-@@ -22842,9 +22842,6 @@
</del><ins>+@@ -22240,9 +22240,6 @@
</ins><span class="cx"> presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
</span><span class="cx"> esac
</span><span class="cx">
</span><span class="lines">@@ -19,16 +19,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # check for header files
</span><del>-@@ -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 @@
</del><ins>+@@ -30464,10 +30461,10 @@
</ins><span class="cx"> *) glib_vacopy=''
</span><span class="cx"> esac
</span><span class="cx">
</span><span class="lines">@@ -42,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>-@@ -32714,18 +32711,32 @@
</del><ins>+@@ -32224,18 +32221,32 @@
</ins><span class="cx"> cat >>$outfile <<_______EOF
</span><span class="cx"> #define G_HAVE_GINT64 1 /* deprecated, always true */
</span><span class="cx">
</span><span class="lines">@@ -82,7 +73,7 @@
</span><span class="cx"> _______EOF
</span><span class="cx"> else
</span><span class="cx"> cat >>$outfile <<_______EOF
</span><del>-@@ -32737,10 +32748,17 @@
</del><ins>+@@ -32247,10 +32258,17 @@
</ins><span class="cx">
</span><span class="cx"> cat >>$outfile <<_______EOF
</span><span class="cx">
</span><span class="lines">@@ -104,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> _______EOF
</span><span class="cx">
</span><del>-@@ -32769,18 +32787,33 @@
</del><ins>+@@ -32279,18 +32297,33 @@
</ins><span class="cx"> if test -z "$glib_unknown_void_p"; then
</span><span class="cx"> cat >>$outfile <<_______EOF
</span><span class="cx">
</span><span class="lines">@@ -147,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' >>$outfile
</span><del>-@@ -32895,7 +32928,9 @@
</del><ins>+@@ -32405,7 +32438,9 @@
</ins><span class="cx">
</span><span class="cx"> if test x"$g_memory_barrier_needed" != xno; then
</span><span class="cx"> echo >>$outfile
</span><span class="lines">@@ -157,7 +148,7 @@
</span><span class="cx"> fi
</span><span class="cx"> if test x"$g_atomic_lock_free" = xyes; then
</span><span class="cx"> echo >>$outfile
</span><del>-@@ -32905,27 +32940,52 @@
</del><ins>+@@ -32415,27 +32450,52 @@
</ins><span class="cx"> g_bit_sizes="16 32 64"
</span><span class="cx"> for bits in $g_bit_sizes; do
</span><span class="cx"> cat >>$outfile <<_______EOF
</span></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 (141295 => 141296)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff 2015-10-14 23:06:02 UTC (rev 141295)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gi18n.h.diff 2015-10-14 23:13:46 UTC (rev 141296)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</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 (141295 => 141296)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2015-10-14 23:06:02 UTC (rev 141295)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_gdbusprivate.c.diff 2015-10-14 23:13:46 UTC (rev 141296)
</span><span class="lines">@@ -1,20 +1,20 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</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 ("/var/lib/dbus/machine-id",
</span><del>-+ if (!g_file_get_contents ("/opt/local/var/lib/dbus/machine-id",
</del><ins>++ if (!g_file_get_contents ("@@PREFIX@@/var/lib/dbus/machine-id",
</ins><span class="cx"> &ret,
</span><span class="cx"> NULL,
</span><span class="cx"> &first_error) &&
</span><del>-@@ -2078,7 +2078,7 @@
</del><ins>+@@ -2110,7 +2110,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"> - _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
</span><del>-+ _("Unable to load /opt/local/var/lib/dbus/machine-id or /etc/machine-id: "));
</del><ins>++ _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id or /etc/machine-id: "));
</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 (141295 => 141296)</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-14 23:06:02 UTC (rev 141295)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff 2015-10-14 23:13:46 UTC (rev 141296)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</ins><span class="cx">
</span><span class="cx"> xdg_data_dirs = getenv ("XDG_DATA_DIRS");
</span><span class="cx"> if (xdg_data_dirs == NULL)
</span><span class="cx"> - xdg_data_dirs = "/usr/local/share/:/usr/share/";
</span><del>-+ xdg_data_dirs = "/opt/local/share/:/usr/share/";
</del><ins>++ xdg_data_dirs = "@@PREFIX@@/share/:/usr/share/";
</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 (141295 => 141296)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff 2015-10-14 23:06:02 UTC (rev 141295)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib-gmain.c.diff 2015-10-14 23:13:46 UTC (rev 141296)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><del>---- 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 @@
</del><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
</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 (141295 => 141296)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff 2015-10-14 23:06:02 UTC (rev 141295)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-glib_gunicollate.c.diff 2015-10-14 23:13:46 UTC (rev 141296)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> #include <wchar.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>