<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/2e20eae8781a5e8353933676d6a14c765288e72b">https://github.com/macports/macports-ports/commit/2e20eae8781a5e8353933676d6a14c765288e72b</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 2e20eae glib2-devel: Update to 2.55.0
</span>2e20eae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2e20eae8781a5e8353933676d6a14c765288e72b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Nov 22 22:59:31 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: Update to 2.55.0
</span>---
devel/glib2-devel/Portfile | 8 +-
...atch-configure-switch-for-gappinfo-impl-mp.diff | 226 +++++++--------------
.../patch-configure-switch-for-gappinfo-impl.diff | 48 ++---
devel/glib2-devel/files/patch-configure.diff | 20 +-
devel/glib2-devel/files/patch-glib-gmain.c.diff | 6 +-
.../files/patch-gmodule-gmodule-dl.c.diff | 8 +-
6 files changed, 110 insertions(+), 206 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 971a2ef..1093312 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name glib2-devel
conflicts glib2
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.54.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.55.0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,9 @@ long_description Glib is a library which includes support routines \
</span>
master_sites gnome:sources/${my_name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6804848c49bc882da563d8c3e025f1e37518bbc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7830724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b84262ede75903997052a2cf541dd696d49f0815 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 13fc009e68ca490f986f21a7d5d3a429486fb28a1f4e06298c9ac976067518f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7904040
</span>
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 172172c..f26c40c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,9 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> re-generate and re-run the configure script, which will OVERWRITE
MacPorts-specific changes!
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.in.orig 2017-10-02 10:02:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in 2017-10-02 17:24:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -714,6 +714,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.in.orig 2017-11-22 22:39:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h.in 2017-11-22 22:41:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -720,6 +720,13 @@
</span> /* Use w32 threads */
#undef THREADS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +54,8 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> /* Using GNU libiconv */
#undef USE_LIBICONV_GNU
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-10-02 18:22:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-10-02 18:22:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-11-22 22:39:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-11-22 22:41:23.000000000 -0600
</span> @@ -722,6 +722,10 @@
LIBMOUNT_CFLAGS
LIBELF_LIBS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> XATTR_LIBS
HAVE_FAM_FALSE
HAVE_FAM_TRUE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -999,6 +1003,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -998,6 +1002,7 @@
</span> enable_selinux
enable_fam
enable_xattr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> enable_libelf
enable_libmount
with_threads
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1731,6 +1736,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1730,6 +1735,8 @@
</span> --with-gio-module-dir=DIR
load gio modules from this directory
[LIBDIR/gio/modules]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> --with-threads=[posix/win32]
specify a thread implementation to use
--with-pcre=[internal/system]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26344,6 +26351,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26326,6 +26333,49 @@
</span> fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +134,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> # Check whether --enable-libelf was given.
if test "${enable_libelf+set}" = set; then :
enableval=$enable_libelf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29790,6 +29840,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29774,6 +29824,14 @@
</span> as_fn_error $? "conditional \"HAVE_FAM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,52 +149,19 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> if test -z "${HAVE_LIBMOUNT_TRUE}" && test -z "${HAVE_LIBMOUNT_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LIBMOUNT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.in.orig 2017-06-24 06:14:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.in 2017-06-24 06:26:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,55 +160,65 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_installed_test_data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @ENABLE_INSTALLED_TESTS_TRUE@am__append_13 = $(test_ltlibraries) $(installed_test_ltlibraries)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @ENABLE_INSTALLED_TESTS_TRUE@am__append_14 = $(installed_test_meta_DATA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_15 = xdgmime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@am__append_16 = gio-2.0.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_WIN32_TRUE@am__append_17 = $(win32_settings_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_COCOA_TRUE@am__append_18 = $(cocoa_settings_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_INOTIFY_TRUE@am__append_19 = inotify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_INOTIFY_TRUE@am__append_20 = inotify/libinotify.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_GENERIC_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_15 = xdgmime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_16 = xdgmime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@am__append_17 = gio-2.0.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_WIN32_TRUE@am__append_18 = $(win32_settings_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_TRUE@am__append_19 = $(cocoa_settings_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_INOTIFY_TRUE@am__append_20 = inotify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_INOTIFY_TRUE@am__append_21 = inotify/libinotify.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_KQUEUE_TRUE@am__append_22 = kqueue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_KQUEUE_TRUE@am__append_23 = kqueue/libkqueue.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_INOTIFY_TRUE@am__append_22 = inotify/libinotify.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_KQUEUE_TRUE@am__append_23 = kqueue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_KQUEUE_TRUE@am__append_24 = kqueue/libkqueue.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_WIN32_TRUE@am__append_25 = win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_WIN32_TRUE@am__append_26 = win32/libgiowin32.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_KQUEUE_TRUE@am__append_25 = kqueue/libkqueue.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_WIN32_TRUE@am__append_26 = win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_WIN32_TRUE@am__append_27 = win32/libgiowin32.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_FAM_TRUE@am__append_28 = fam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/Makefile.in.orig 2017-11-22 22:39:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.in 2017-11-22 22:41:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,39 +176,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_FAM_TRUE@am__append_28 = fam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
</span> -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_31 = gdesktopappinfo.h
-@MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
-@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_WIN32_TRUE@am__append_28 = win32/libgiowin32.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_FAM_TRUE@am__append_29 = fam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_30 = gosxappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_31 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_33 = gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_34 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_37 = gcocoanotificationbackend.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_38 = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_31 = gosxappinfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_33 = gcocoanotificationbackend.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_34 = \
</span> @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \
@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornm.c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,28 +175,28 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> -@OS_COCOA_TRUE@am__append_38 = gosxappinfo.c gosxappinfo.h
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_39 = gcontenttype.c
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_40 = gdesktopappinfo.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_TRUE@@OS_WIN32_TRUE@am__append_39 = gwin32appinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_TRUE@@OS_WIN32_TRUE@am__append_40 = gwin32appinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_FALSE@@OS_WIN32_TRUE@am__append_41 = gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_FALSE@@OS_WIN32_TRUE@am__append_42 = gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_WIN32_TRUE@am__append_43 = gcontenttype-win32.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_WIN32_TRUE@am__append_44 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_45 = gosxcontenttype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_46 = gosxappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_47 = gcontenttype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_48 = gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_49 = gcontenttype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_50 = gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_TRUE@@OS_WIN32_TRUE@am__append_35 = gwin32appinfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_TRUE@@OS_WIN32_TRUE@am__append_36 = gwin32appinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_FALSE@@OS_WIN32_TRUE@am__append_37 = gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_FALSE@@OS_WIN32_TRUE@am__append_38 = gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_WIN32_TRUE@am__append_39 = gcontenttype-win32.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_WIN32_TRUE@am__append_40 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_41 = gosxcontenttype.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_42 = gosxappinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_43 = gcontenttype.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@APPINFO_IMPL_NATIVE_FALSE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_44 = gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_45 = gcontenttype.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_46 = gdesktopappinfo.c
</span>
# This is dumb. The ObjC source file should be properly named .m
-@OS_COCOA_TRUE@am__append_41 = -xobjective-c
-@OS_COCOA_TRUE@am__append_42 = -Wl,-framework,Foundation -Wl,-framework,AppKit
-@HAVE_LIBMOUNT_TRUE@am__append_43 = $(LIBMOUNT_CFLAGS)
-@HAVE_LIBMOUNT_TRUE@am__append_44 = $(LIBMOUNT_LIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_TRUE@am__append_51 = -xobjective-c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_TRUE@am__append_52 = -Wl,-framework,Foundation -Wl,-framework,AppKit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_LIBMOUNT_TRUE@am__append_53 = $(LIBMOUNT_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_LIBMOUNT_TRUE@am__append_54 = $(LIBMOUNT_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_COCOA_TRUE@am__append_47 = -xobjective-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_COCOA_TRUE@am__append_48 = -Wl,-framework,Foundation -Wl,-framework,AppKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@HAVE_LIBMOUNT_TRUE@am__append_49 = $(LIBMOUNT_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@HAVE_LIBMOUNT_TRUE@am__append_50 = $(LIBMOUNT_LIBS)
</span> bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT) gio$(EXEEXT)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,31 +204,19 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> -@ENABLE_DTRACE_TRUE@am__append_46 = gio_probes.h gio_probes.h.tmp
-@ENABLE_DTRACE_TRUE@am__append_47 = gio_probes.lo
-@ENABLE_SYSTEMTAP_TRUE@am__append_48 = $(tapset_DATA)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+@ENABLE_DTRACE_TRUE@am__append_55 = gio_probes.h gio_probes.lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@ENABLE_DTRACE_TRUE@am__append_56 = gio_probes.h gio_probes.h.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@ENABLE_DTRACE_TRUE@am__append_57 = gio_probes.lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@ENABLE_SYSTEMTAP_TRUE@am__append_58 = $(tapset_DATA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@ENABLE_DTRACE_TRUE@am__append_51 = gio_probes.h gio_probes.lo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@ENABLE_DTRACE_TRUE@am__append_52 = gio_probes.h gio_probes.h.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@ENABLE_DTRACE_TRUE@am__append_53 = gio_probes.lo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@ENABLE_SYSTEMTAP_TRUE@am__append_54 = $(tapset_DATA)
</span>
# ------------------------------------------------------------------------
# gapplication(1) tool
-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_49 = gapplication
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_59 = gapplication
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_55 = gapplication
</span> subdir = gio
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -273,8 +283,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LTLIBRARIES = $(installed_test_LTLIBRARIES) $(lib_LTLIBRARIES) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(noinst_LTLIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__DEPENDENCIES_1 =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--am__DEPENDENCIES_2 = $(am__append_20) $(am__append_23) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__append_26) $(am__append_29) $(am__DEPENDENCIES_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+am__DEPENDENCIES_2 = $(am__append_21) $(am__append_24) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_27) $(am__append_31) $(am__append_34) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__DEPENDENCIES_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_LIBMOUNT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__libgio_2_0_la_SOURCES_DIST = gappinfo.c gappinfoprivate.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gasynchelper.c gasynchelper.h gasyncinitable.c gasyncresult.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -359,26 +370,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -359,26 +365,25 @@
</span> glocalvfs.h gsocks4proxy.c gsocks4proxy.h gsocks4aproxy.c \
gsocks4aproxy.h gsocks5proxy.c gsocks5proxy.h \
thumbnail-verify.h thumbnail-verify.c gwin32appinfo.c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,7 +262,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
gwin32networking.h gvdb/gvdb-format.h gvdb/gvdb-reader.h \
gvdb/gvdb-reader.c gdelayedsettingsbackend.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -524,24 +534,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -524,24 +529,29 @@
</span> libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
$(am__objects_4) $(am__objects_1)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,7 +306,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> @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 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -559,17 +574,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,18 +569,18 @@
</span> @OS_UNIX_TRUE@ libgio_2_0_la-gdocumentportal.lo \
@OS_UNIX_TRUE@ libgio_2_0_la-gopenuriportal.lo \
@OS_UNIX_TRUE@ libgio_2_0_la-gportalsupport.lo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,13 +324,14 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> libgio_2_0_la-gwin32inputstream.lo \
libgio_2_0_la-gwin32outputstream.lo $(am__objects_1)
-@OS_WIN32_TRUE@am__objects_21 = $(am__objects_20)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--am__objects_22 = libgio_2_0_la-gvdb-reader.lo \
</span> +@OS_WIN32_TRUE@am__objects_24 = $(am__objects_23)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+am__objects_25 = libgio_2_0_la-gvdb-reader.lo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__dirstamp = $(am__leading_dot)dirstamp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-am__objects_22 = gvdb/libgio_2_0_la-gvdb-reader.lo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++am__objects_25 = gvdb/libgio_2_0_la-gvdb-reader.lo \
</span> libgio_2_0_la-gdelayedsettingsbackend.lo \
libgio_2_0_la-gkeyfilesettingsbackend.lo \
libgio_2_0_la-gmemorysettingsbackend.lo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,16 +592,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -578,16 +588,16 @@
</span> 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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -400,7 +356,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> 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@)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -725,9 +740,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -726,9 +736,11 @@
</span> am__giounixinclude_HEADERS_DIST = gfiledescriptorbased.h \
gunixconnection.h gunixcredentialsmessage.h gunixmounts.h \
gunixfdlist.h gunixfdmessage.h gunixinputstream.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -414,89 +370,53 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> HEADERS = $(gioinclude_HEADERS) $(giounixinclude_HEADERS) \
$(giowin32include_HEADERS) $(nodist_gioinclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1221,12 +1238,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1221,12 +1233,12 @@
</span> BUILT_SOURCES = $(xdp_dbus_built_sources) gconstructor_as_data.h \
gioenumtypes.h gioenumtypes.c gdbus-daemon-generated.c \
gdbus-daemon-generated.h gnetworking.h $(NULL) \
- $(am__append_45)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_55)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_51)
</span> BUILT_EXTRA_DIST = gio.rc
CLEANFILES = *.log *.trs $(am__append_14) $(xdp_dbus_built_sources) \
gdbus-daemon-generated.c gdbus-daemon-generated.h \
- gio-public-headers.txt gconstructor_as_data.h $(am__append_46) \
- $(am__append_48)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gio-public-headers.txt gconstructor_as_data.h $(am__append_56) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_58)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gio-public-headers.txt gconstructor_as_data.h $(am__append_52) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_54)
</span> DISTCLEANFILES = gioenumtypes.h gioenumtypes.c
MAINTAINERCLEANFILES =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1287,7 +1304,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nobase_installed_test_DATA = $(am__append_12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- noinst_LTLIBRARIES = $(am__append_2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- noinst_SCRIPTS = $(am__append_4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--noinst_DATA = $(am__append_5) $(am__append_16)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+noinst_DATA = $(am__append_5) $(am__append_17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_LTLIBRARIES = $(am__append_6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_SCRIPTS = $(am__append_8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_DATA = $(am__append_9)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1315,8 +1332,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__append_22) $(am__append_25) . tests $(am__append_28)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_16) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_20) $(am__append_23) $(am__append_26) . tests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_29)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CPPFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1406,8 +1424,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gsettings-mapping.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gsettings.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--settings_sources = $(settings_base_sources) $(am__append_17) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__append_18)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+settings_sources = $(settings_base_sources) $(am__append_18) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_19)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_WIN32_TRUE@win32_settings_sources = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_WIN32_TRUE@ gregistrysettingsbackend.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_WIN32_TRUE@ gregistrysettingsbackend.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1493,14 +1511,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thumbnail-verify.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1505,13 +1517,15 @@
</span> $(NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
</span> - $(am__append_29) $(am__append_36)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__append_30)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_29) $(am__append_40)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(am__append_30)
</span> -appinfo_sources = $(am__append_34) $(am__append_38) $(am__append_40)
-appinfo_headers = $(am__append_31)
-contenttype_sources = $(am__append_35) $(am__append_37) \
- $(am__append_39)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+platform_libadd = $(am__append_21) $(am__append_24) $(am__append_27) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_31) $(am__append_34) $(am__append_44)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+platform_deps = $(am__append_22) $(am__append_25) $(am__append_28) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_32) $(am__append_35)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_sources = $(am__append_40) $(am__append_42) $(am__append_46) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_48) $(am__append_50)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_headers = $(am__append_30) $(am__append_33) $(am__append_36) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_39) $(am__append_41)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+contenttype_sources = $(am__append_43) $(am__append_45) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_47) $(am__append_49)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++appinfo_sources = $(am__append_36) $(am__append_38) $(am__append_42) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_44) $(am__append_46)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++appinfo_headers = $(am__append_31) $(am__append_32) $(am__append_35) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_37)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++contenttype_sources = $(am__append_39) $(am__append_41) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_43) $(am__append_45)
</span> @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 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1514,7 +1534,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1525,7 +1539,7 @@
</span> @OS_UNIX_TRUE@ gdocumentportal.h gopenuriportal.c \
@OS_UNIX_TRUE@ gopenuriportal.h gportalsupport.c \
@OS_UNIX_TRUE@ gportalsupport.h $(portal_sources) $(NULL) \
-@OS_UNIX_TRUE@ $(am__append_32) $(am__append_33)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+@OS_UNIX_TRUE@ $(am__append_37) $(am__append_38)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@OS_UNIX_TRUE@ $(am__append_33) $(am__append_34)
</span> @OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio
@OS_UNIX_TRUE@giounixinclude_HEADERS = \
@OS_UNIX_TRUE@ gfiledescriptorbased.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1526,7 +1546,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1537,7 +1551,7 @@
</span> @OS_UNIX_TRUE@ gunixinputstream.h \
@OS_UNIX_TRUE@ gunixoutputstream.h \
@OS_UNIX_TRUE@ gunixsocketaddress.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,7 +425,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> @OS_UNIX_TRUE@ $(NULL)
gdbus_daemon_sources = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1566,6 +1586,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1577,6 +1591,7 @@
</span> @OS_WIN32_TRUE@giowin32include_HEADERS = \
@OS_WIN32_TRUE@ gwin32inputstream.h \
@OS_WIN32_TRUE@ gwin32outputstream.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -513,27 +433,27 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> @OS_WIN32_TRUE@ $(NULL)
xdp_dbus_built_sources = xdp-dbus.c xdp-dbus.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1749,16 +1770,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1760,16 +1775,16 @@
</span> $(top_builddir)/gmodule/libgmodule-2.0.la \
$(top_builddir)/glib/libglib-2.0.la $(platform_libadd) \
$(ZLIB_LIBS) $(SELINUX_LIBS) $(GLIB_LIBS) $(XATTR_LIBS) \
- $(NETWORK_LIBS) $(NULL) $(am__append_44) $(am__append_47)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(NETWORK_LIBS) $(NULL) $(am__append_54) $(am__append_57)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(NETWORK_LIBS) $(NULL) $(am__append_50) $(am__append_53)
</span> libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
@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_41) $(am__append_43)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_51) $(am__append_53)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_47) $(am__append_49)
</span> 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_42)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -export-dynamic $(no_undefined) $(am__append_52)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -export-dynamic $(no_undefined) $(am__append_48)
</span> libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
gio_headers = \
gappinfo.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3831,13 +3852,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3857,13 +3872,6 @@
</span> @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-gwin32appinfo.lo `test -f 'gwin32appinfo.c' || echo '$(srcdir)/'`gwin32appinfo.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -547,7 +467,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> libgio_2_0_la-gdesktopappinfo.lo: gdesktopappinfo.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-gdesktopappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gdesktopappinfo.Tpo -c -o libgio_2_0_la-gdesktopappinfo.lo `test -f 'gdesktopappinfo.c' || echo '$(srcdir)/'`gdesktopappinfo.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gdesktopappinfo.Tpo $(DEPDIR)/libgio_2_0_la-gdesktopappinfo.Plo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3845,6 +3859,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3871,6 +3879,13 @@
</span> @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-gdesktopappinfo.lo `test -f 'gdesktopappinfo.c' || echo '$(srcdir)/'`gdesktopappinfo.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a1fc6da..713f8d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.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.ac.orig 2017-06-19 20:51:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-06-24 05:42:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1712,6 +1712,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-11-15 21:00:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2017-11-22 22:01:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1716,6 +1716,31 @@
</span> ])
AC_SUBST(XATTR_LIBS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,40 +32,24 @@
</span> dnl ************************
dnl *** check for libelf ***
dnl ************************
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.am.orig 2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.am 2017-06-24 05:42:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUBDIRS = gdbus-2.0/codegen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if OS_UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if !OS_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if OS_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if APPINFO_IMPL_GENERIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUBDIRS += xdgmime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUBDIRS += xdgmime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -251,7 +255,16 @@
</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:#e0ffe0;'>+--- gio/Makefile.am.orig 2017-11-13 11:02:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.am 2017-11-22 22:33:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,9 +262,13 @@
</span> if OS_UNIX
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_libadd += xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_deps += xdgmime/libxdgmime.la
</span> -if !OS_COCOA
+if OS_COCOA
+if APPINFO_IMPL_NATIVE
+appinfo_headers += gosxappinfo.h
+else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+platform_libadd += xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+platform_deps += xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_headers += gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appinfo_headers += gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span> +endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_libadd += xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_deps += xdgmime/libxdgmime.la
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -305,7 +318,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix_sources = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +317,7 @@
</span> gunixinputstream.h \
gunixoutputstream.h \
gunixsocketaddress.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +58,7 @@
</span> $(NULL)
if HAVE_NETLINK
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,7 +364,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -359,7 +363,13 @@
</span> win32/gwin32filemonitor.c
if OS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +73,7 @@
</span> contenttype_sources += gcontenttype-win32.c
platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
win32_sources = $(win32_actual_sources)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,6 +379,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,6 +378,7 @@
</span> giowin32include_HEADERS = \
gwin32inputstream.h \
gwin32outputstream.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +81,7 @@
</span> $(NULL)
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -398,13 +418,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -406,13 +417,16 @@
</span> $(xdp_dbus_built_sources) \
$(NULL)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-configure.diff b/devel/glib2-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2464ad2..51b76b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-10-02 10:02:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-10-02 18:18:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22884,9 +22884,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-11-15 21:01:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-11-22 21:47:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22834,9 +22834,6 @@
</span> presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
-if test x$ac_cv_c_bigendian = xuniversal ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "Universal builds not supported: see https://bugs.gnome.org/742548" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "Universal builds not supported: see https://bugzilla.gnome.org/show_bug.cgi?id=742548" "$LINENO" 5
</span> -fi
# check for header files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31051,10 +31048,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31038,10 +31035,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;'>-@@ -32710,18 +32707,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32697,18 +32694,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;'>-@@ -32733,10 +32744,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32720,10 +32731,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;'>-@@ -32767,18 +32785,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32754,18 +32772,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;'>-@@ -32873,7 +32906,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32860,7 +32893,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;'>-@@ -32883,27 +32918,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32870,27 +32905,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-devel/files/patch-glib-gmain.c.diff b/devel/glib2-devel/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fb98fd4..e66c520 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/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 2017-06-02 11:55:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gmain.c 2017-06-24 05:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2725,46 +2725,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gmain.c.orig 2017-11-13 11:02:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gmain.c 2017-11-22 21:47:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2759,46 +2759,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-devel/files/patch-gmodule-gmodule-dl.c.diff b/devel/glib2-devel/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 708f7bd..e893ba3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/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 2017-05-13 11:45:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c 2017-05-22 18:44:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,22 +133,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmodule/gmodule-dl.c.orig 2017-10-27 19:42:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmodule/gmodule-dl.c 2017-11-22 21:54:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,22 +134,18 @@
</span> _g_module_close (gpointer handle,
gboolean is_unref)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> + * and at worst lead to arbitrary code execution of whatever happened to be
+ * at that location in memory at a later time in the process.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__BIONIC__) && !defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__BIONIC__)
</span> - is_unref = (handle != RTLD_DEFAULT);
-#else
- is_unref |= 1;
</pre><pre style='margin:0'>
</pre>