<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/49a3ec66b5fd90954226759396fdf804b6f6e9c3">https://github.com/macports/macports-ports/commit/49a3ec66b5fd90954226759396fdf804b6f6e9c3</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 49a3ec6 glib2-devel: Update to 2.55.2
</span>49a3ec6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 49a3ec66b5fd90954226759396fdf804b6f6e9c3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Feb 16 06:12:19 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: Update to 2.55.2
</span>---
devel/glib2-devel/Portfile | 9 ++-
...atch-configure-switch-for-gappinfo-impl-mp.diff | 64 +++++++++++-----------
.../patch-configure-switch-for-gappinfo-impl.diff | 24 ++++----
devel/glib2-devel/files/patch-configure.diff | 18 +++---
.../patch-get-launchd-dbus-session-address.diff | 8 +--
devel/glib2-devel/files/patch-glib-gmain.c.diff | 6 +-
6 files changed, 64 insertions(+), 65 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 7405bae..3a7ae26 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,8 +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.55.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.55.2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,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 84c830630fc167ae4ed73413e304f570ec3d3c28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0cbb3d31c9d181bbcc97cba3d9dbe3250f75e2da25e5f7c8bf5a993fe54baf6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7923872
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8806ba99c523e0961cd73dc36500104bc0dd6a06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a26bfa83bb412d181504a0773101093c9e538c3d0e09d30f5178885d78e72f6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7968728
</span>
# patch-configure-switch-for-gappinfo-impl-mp.diff: understand comments inline!
# => https://trac.macports.org/ticket/53911
<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 f26c40c..b2ad8d8 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;'>@@ -1,7 +1,7 @@
</span> This file includes a patch to support switching between native and generic
application information interfaces.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-The native interfaced is used for Quartz-based builds of GTK+ and uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The native interface is used for Quartz-based builds of GTK+ and uses
</span> application bundle information, while the generic interface is the freedesktop
implementation working with standard .desktop files.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,12 @@ IMPORTANT: this file includes only changes as generated after running
</span> the new patch-configure-switch-for-gappinfo-impl-mp.diff file
only includes generated changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-WARNING: changes to autoconf.ac will lead to the build system trying to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+WARNING: changes to configure.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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.in.orig 2017-11-22 22:39:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in 2017-11-22 22:41:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -720,6 +720,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.in.orig 2018-02-16 05:54:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h.in 2018-02-16 05:56:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -732,6 +732,13 @@
</span> /* Use w32 threads */
#undef THREADS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +53,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-11-22 22:39:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-11-22 22:41:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-02-16 05:54:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-02-16 05:56:09.000000000 -0600
</span> @@ -722,6 +722,10 @@
LIBMOUNT_CFLAGS
LIBELF_LIBS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +66,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;'>-@@ -998,6 +1002,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -997,6 +1001,7 @@
</span> enable_selinux
enable_fam
enable_xattr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +83,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;'>-@@ -26326,6 +26333,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26422,6 +26429,49 @@
</span> fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +133,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;'>-@@ -29774,6 +29824,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29879,6 +29929,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,8 +148,8 @@ 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-11-22 22:39:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.in 2017-11-22 22:41:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/Makefile.in.orig 2018-02-16 05:54:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.in 2018-02-16 05:56:12.000000000 -0600
</span> @@ -176,39 +176,45 @@
@HAVE_FAM_TRUE@am__append_28 = fam
@OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,9 +259,9 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> + gwin32registrykey.c gwin32registrykey.h gwin32mount.c \
+ gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gwin32networking.h gvdb/gvdb-format.h gvdb/gvdb-reader.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gvdb/gvdb-reader.c gdelayedsettingsbackend.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -524,24 +529,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gwin32networking.h gwin32networkmonitor.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gwin32networkmonitor.h gvdb/gvdb-format.h gvdb/gvdb-reader.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -526,24 +531,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;'>@@ -306,7 +305,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,18 +569,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -561,19 +571,19 @@
</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;'>@@ -322,7 +321,8 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> libgio_2_0_la-gwin32mount.lo \
libgio_2_0_la-gwin32volumemonitor.lo \
libgio_2_0_la-gwin32inputstream.lo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_2_0_la-gwin32outputstream.lo $(am__objects_1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgio_2_0_la-gwin32outputstream.lo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgio_2_0_la-gwin32networkmonitor.lo $(am__objects_1)
</span> -@OS_WIN32_TRUE@am__objects_21 = $(am__objects_20)
+@OS_WIN32_TRUE@am__objects_24 = $(am__objects_23)
am__dirstamp = $(am__leading_dot)dirstamp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,7 +331,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</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;'>-@@ -578,16 +588,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,16 +591,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;'>@@ -356,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;'>-@@ -726,9 +736,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -730,9 +740,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;'>@@ -370,7 +370,7 @@ 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 +1233,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1224,12 +1236,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) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,7 +386,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> DISTCLEANFILES = gioenumtypes.h gioenumtypes.c
MAINTAINERCLEANFILES =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1505,13 +1517,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1508,13 +1520,15 @@
</span> $(NULL)
platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -407,7 +407,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</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;'>-@@ -1525,7 +1539,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1528,7 +1542,7 @@
</span> @OS_UNIX_TRUE@ gdocumentportal.h gopenuriportal.c \
@OS_UNIX_TRUE@ gopenuriportal.h gportalsupport.c \
@OS_UNIX_TRUE@ gportalsupport.h $(portal_sources) $(NULL) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,7 +416,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</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;'>-@@ -1537,7 +1551,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1540,7 +1554,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;'>@@ -425,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;'>-@@ -1577,6 +1591,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1582,6 +1596,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;'>@@ -433,7 +433,7 @@ 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;'>-@@ -1760,16 +1775,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1766,16 +1781,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) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,7 +453,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</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;'>-@@ -3857,13 +3872,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3873,13 +3888,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;'>@@ -467,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;'>-@@ -3871,6 +3879,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3887,6 +3895,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;background:#e0e0e0;'>@@ -481,8 +481,8 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> libgio_2_0_la-gcontenttype-win32.lo: gcontenttype-win32.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-gcontenttype-win32.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Tpo -c -o libgio_2_0_la-gcontenttype-win32.lo `test -f 'gcontenttype-win32.c' || echo '$(srcdir)/'`gcontenttype-win32.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Tpo $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2017-06-22 07:52:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2017-06-24 06:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2018-01-22 14:28:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2018-02-16 05:55:21.000000000 -0600
</span> @@ -43,12 +43,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -500,7 +500,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span>
#ifdef HAVE_COCOA
#include <AvailabilityMacros.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -978,7 +979,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1011,7 +1012,7 @@
</span> {
registered_extensions = TRUE;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -509,7 +509,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> #if !GLIB_CHECK_VERSION (3, 0, 0)
ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1119,8 +1120,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1152,8 +1153,10 @@
</span> #endif
#ifdef HAVE_COCOA
g_type_ensure (g_nextstep_settings_backend_get_type ());
<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 713f8d5..b69899f 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-11-15 21:00:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-11-22 22:01:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1716,6 +1716,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-02-06 14:10:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-02-16 05:55:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1759,6 +1759,31 @@
</span> ])
AC_SUBST(XATTR_LIBS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,8 @@
</span> dnl ************************
dnl *** check for libelf ***
dnl ************************
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.am.orig 2017-11-13 11:02:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.am 2017-11-22 22:33:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/Makefile.am.orig 2018-01-22 14:28:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.am 2018-02-16 05:55:21.000000000 -0600
</span> @@ -262,9 +262,13 @@
if OS_UNIX
platform_libadd += xdgmime/libxdgmime.la
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@
</span> $(NULL)
if HAVE_NETLINK
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -359,7 +363,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -361,7 +365,13 @@
</span> win32/gwin32filemonitor.c
if OS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,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;'>-@@ -368,6 +378,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,6 +380,7 @@
</span> giowin32include_HEADERS = \
gwin32inputstream.h \
gwin32outputstream.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@
</span> $(NULL)
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,13 +417,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -408,13 +419,16 @@
</span> $(xdp_dbus_built_sources) \
$(NULL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,8 +102,8 @@
</span> contenttype_sources += gcontenttype.c
appinfo_sources += gdesktopappinfo.c
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2017-06-24 05:44:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2018-01-22 14:28:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2018-02-16 05:55:21.000000000 -0600
</span> @@ -43,12 +43,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@
</span>
#ifdef HAVE_COCOA
#include <AvailabilityMacros.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -978,7 +979,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1011,7 +1012,7 @@
</span> {
registered_extensions = TRUE;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +130,7 @@
</span> #if !GLIB_CHECK_VERSION (3, 0, 0)
ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1119,8 +1120,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1152,8 +1153,10 @@
</span> #endif
#ifdef HAVE_COCOA
g_type_ensure (g_nextstep_settings_backend_get_type ());
<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 51b76b9..930fbc6 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-11-15 21:01:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-11-22 21:47:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22834,9 +22834,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-02-06 15:25:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-02-16 05:46:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22783,9 +22783,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;'>-@@ -31038,10 +31035,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31143,10 +31140,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;'>-@@ -32697,18 +32694,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32805,18 +32802,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;'>-@@ -32720,10 +32731,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32828,10 +32839,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;'>-@@ -32754,18 +32772,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32862,18 +32880,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;'>-@@ -32860,7 +32893,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32968,7 +33001,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;'>-@@ -32870,27 +32905,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32978,27 +33013,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-get-launchd-dbus-session-address.diff b/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c3a7d8f..3e8be97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/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 2017-02-13 09:53:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusaddress.c 2017-03-29 21:05:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1514,6 +1514,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gdbusaddress.c.orig 2018-02-06 09:44:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gdbusaddress.c 2018-02-16 05:49:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1524,6 +1524,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;'>-@@ -1542,7 +1639,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1552,7 +1649,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-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 e66c520..e9234a8 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-11-13 11:02:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gmain.c 2017-11-22 21:47:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2759,46 +2759,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gmain.c.orig 2018-01-22 14:28:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gmain.c 2018-02-16 05:47:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2754,46 +2754,34 @@
</span> g_get_monotonic_time (void)
{
static mach_timebase_info_data_t timebase_info;
</pre><pre style='margin:0'>
</pre>