<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a87fe62d236d781e8a5feeb1fb2a5f6a0940a118">https://github.com/macports/macports-ports/commit/a87fe62d236d781e8a5feeb1fb2a5f6a0940a118</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a87fe62 glib2: Backport changes from glib2-devel
</span>a87fe62 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a87fe62d236d781e8a5feeb1fb2a5f6a0940a118
</span>Author: Ryan Schmidt <github@ryandesign.com>
AuthorDate: Mon Jun 19 14:15:07 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2: Backport changes from glib2-devel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/54346
</span>---
devel/glib2/Portfile | 25 ++--
devel/glib2/files/patch-configure.diff | 18 +--
.../patch-get-launchd-dbus-session-address.diff | 8 +-
devel/glib2/files/patch-gio_gdbusprivate.c.diff | 8 +-
devel/glib2/files/patch-glib-gmain.c.diff | 6 +-
devel/glib2/files/patch-glib_gunicollate.c.diff | 6 +-
devel/glib2/files/patch-gmodule-gmodule-dl.c.diff | 8 +-
.../files/remove-gcocoanotificationbackend.patch | 128 ---------------------
8 files changed, 38 insertions(+), 169 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9a5678..0a73032 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,6 @@ PortGroup compiler_blacklist_versions 1.0
</span> name glib2
conflicts glib2-devel
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> version 2.52.2
revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,14 +45,6 @@ patchfiles patch-configure.diff \
</span> patch-gmodule-gmodule-dl.c.diff \
patch-configure-switch-for-gappinfo-impl-mp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gcocoanotificationbackend requires OS X 10.9 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append remove-gcocoanotificationbackend.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gcocoanotificationbackend.c:115:52: error: array subscript is not an integer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 600}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build bin:xmllint:libxml2
depends_lib port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,8 +53,13 @@ depends_lib port:gettext \
</span> port:pcre \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# GLib-CRITICAL **: attempting to free a locked GVariant instance. This should never happen.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 318}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GLib-CRITICAL **: attempting to free a locked GVariant instance. This should never happen.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 318}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gcocoanotificationbackend.c:115:52: error: array subscript is not an integer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 600}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# https://bugzilla.gnome.org/show_bug.cgi?id=697017
compiler.blacklist-append gcc-3.3 *gcc-4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,6 +97,7 @@ pre-configure {
</span> if {![variant_isset quartz] && ![variant_isset x11]} {
error "Either +x11 or +quartz is required"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set libffi_version [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
configure.env-append LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
LIBFFI_LIBS="-L${prefix}/lib -lffi"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,15 +131,15 @@ platform darwin 8 {
</span> }
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-appinfo-impl=native
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-appinfo-impl=native
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-appinfo-impl=generic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-appinfo-impl=generic
</span> }
if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span> }
livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-configure.diff b/devel/glib2/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 74724f6..4e02054 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-09-19 08:56:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-09-26 02:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22720,9 +22720,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-05-08 10:34:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-06-19 13:37:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22746,9 +22746,6 @@
</span> presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span>
# check for header files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30779,10 +30776,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30847,10 +30844,10 @@
</span> *) glib_vacopy=''
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@
</span>
g_have_gnuc_varargs=$g_have_gnuc_varargs
g_have_iso_c_varargs=$g_have_iso_c_varargs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32440,18 +32437,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32510,18 +32507,32 @@
</span> cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@
</span> _______EOF
else
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32463,10 +32474,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32533,10 +32544,17 @@
</span>
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@
</span>
_______EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32497,18 +32515,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32567,18 +32585,33 @@
</span> if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +129,7 @@
</span> _______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32603,7 +32636,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32673,7 +32706,9 @@
</span>
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +139,7 @@
</span> fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32613,27 +32648,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32683,27 +32718,52 @@
</span> g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d4b330e..80b86da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gdbusaddress.c.orig 2016-07-16 19:33:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusaddress.c 2016-08-18 03:24:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1504,6 +1504,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gdbusaddress.c.orig 2017-02-13 09:53:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gdbusaddress.c 2017-03-29 21:05:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1511,6 +1511,103 @@
</span>
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@
</span> static gchar *
get_session_address_platform_specific (GError **error)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1532,7 +1629,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1539,7 +1636,12 @@
</span> * X11 autolaunching; on Windows this means a different autolaunching
* mechanism based on shared memory.
*/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_gdbusprivate.c.diff b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ce1277c..975c283 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gdbusprivate.c.orig 2016-07-01 14:54:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusprivate.c 2016-08-18 03:24:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2070,7 +2070,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gdbusprivate.c.orig 2017-04-08 00:44:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gdbusprivate.c 2017-06-19 13:37:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2075,7 +2075,7 @@
</span> /* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
first_error = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> &ret,
NULL,
&first_error) &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2080,7 +2080,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2085,7 +2085,7 @@
</span> NULL))
{
g_propagate_prefixed_error (error, first_error,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib-gmain.c.diff b/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f26bd1..4d7d487 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gmain.c.orig 2016-07-16 20:09:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gmain.c 2016-08-18 03:30:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2784,46 +2784,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gmain.c.orig 2017-05-08 09:59:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gmain.c 2017-06-19 13:39:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2811,46 +2811,34 @@
</span> g_get_monotonic_time (void)
{
static mach_timebase_info_data_t timebase_info;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib_gunicollate.c.diff b/devel/glib2/files/patch-glib_gunicollate.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eabfd5f..e37633c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib_gunicollate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib_gunicollate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gunicollate.c.orig 2014-12-19 15:49:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gunicollate.c 2016-08-18 03:30:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gunicollate.c.orig 2017-03-08 21:37:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gunicollate.c 2017-03-29 21:05:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,9 @@
</span> #include <wchar.h>
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff b/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cd7b584..8368363 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmodule/gmodule-dl.c.orig 2014-07-04 16:59:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c 2014-11-03 10:53:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,16 +126,18 @@ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmodule/gmodule-dl.c.orig 2016-10-22 00:22:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmodule/gmodule-dl.c 2017-06-19 13:45:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,16 +126,18 @@
</span> _g_module_close (gpointer handle,
gboolean is_unref)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@
</span> + * initializer which added a child atfork handler. The result is that
+ * after closing the module, the system had a dangling pointer for the
+ * atfork handler which would at best crash on the child side of fork()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * and at worst lead to arbitray code execution of whatever happened to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * and at worst lead to arbitrary code execution of whatever happened to be
</span> + * at that location in memory at a later time in the process.
*/
- is_unref |= 1;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/remove-gcocoanotificationbackend.patch b/devel/glib2/files/remove-gcocoanotificationbackend.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6f86e08..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/remove-gcocoanotificationbackend.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,128 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reverts:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-And most of:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-08-18 03:19:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-08-18 03:19:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6044,30 +6044,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COCOA_LIBS="-Wl,-framework,Foundation"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="$LDFLAGS $COCOA_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- osx_version=`sw_vers -productVersion`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- osx_min_version="10.9.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OSX version >= $osx_min_version" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking OSX version >= $osx_min_version... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_arg_v1=$osx_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--as_arg_v2=$osx_min_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--case $? in #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 1) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "OSX version is too old!" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;; #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 0) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;; #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 2) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;; #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COCOA_LIBS=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.in.orig 2016-08-17 11:22:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.in 2016-08-18 03:22:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,7 +172,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@am__append_31 = $(unix_appinfo_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is dumb. The ObjC source file should be properly named .m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_COCOA_TRUE@am__append_36 = -xobjective-c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_LIBMOUNT_TRUE@am__append_38 = $(LIBMOUNT_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_LIBMOUNT_TRUE@am__append_39 = $(LIBMOUNT_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,7 +359,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gportalsupport.h gnetworkmonitorportal.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnetworkmonitorportal.h gproxyresolverportal.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gproxyresolverportal.h xdp-dbus.c xdp-dbus.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gcocoanotificationbackend.c gnetworkmonitornetlink.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gnetworkmonitornetlink.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnetworkmonitornetlink.h gnetworkmonitornm.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdbus-daemon-generated.c gdbus-daemon-generated.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -521,7 +520,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__objects_12 = libgio_2_0_la-gnetworkmonitorportal.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_2_0_la-gproxyresolverportal.lo $(am__objects_11) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(am__objects_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_13 = libgio_2_0_la-gcocoanotificationbackend.lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_14 = libgio_2_0_la-gnetworkmonitornetlink.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ libgio_2_0_la-gnetworkmonitornm.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ $(am__objects_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -544,7 +542,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@ libgio_2_0_la-gdocumentportal.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@ libgio_2_0_la-gportalsupport.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@ $(am__objects_12) $(am__objects_1) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_UNIX_TRUE@ $(am__objects_13) $(am__objects_14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_UNIX_TRUE@ $(am__objects_14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__objects_16 = libgio_2_0_la-gdbusdaemon.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__objects_17 = $(am__objects_16) libgio_2_0_la-gwin32registrykey.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2356,7 +2354,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3960,13 +3957,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @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-xdp-dbus.lo `test -f 'xdp-dbus.c' || echo '$(srcdir)/'`xdp-dbus.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libgio_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gcocoanotificationbackend.c' object='libgio_2_0_la-gcocoanotificationbackend.lo' libtool=yes @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_2_0_la-gnetworkmonitornetlink.lo: gnetworkmonitornetlink.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Plo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2016-07-16 22:29:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2016-07-21 09:50:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -918,10 +918,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern GType g_network_monitor_portal_get_type (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern GType g_cocoa_notification_backend_get_type (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef G_PLATFORM_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1121,9 +1117,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (g_network_monitor_portal_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (g_proxy_resolver_portal_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_type_ensure (g_cocoa_notification_backend_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (_g_winhttp_vfs_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>