<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/b9f29b14ba3a24393be2b599ae22e98aceab0a85">https://github.com/macports/macports-ports/commit/b9f29b14ba3a24393be2b599ae22e98aceab0a85</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 b9f29b1 glib2-devel: Update to 2.53.3
</span>b9f29b1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b9f29b14ba3a24393be2b599ae22e98aceab0a85
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jun 24 06:09:33 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: Update to 2.53.3
</span>---
devel/glib2-devel/Portfile | 6 +-
...atch-configure-switch-for-gappinfo-impl-mp.diff | 115 +++++++++++----------
.../patch-configure-switch-for-gappinfo-impl.diff | 30 +++---
devel/glib2-devel/files/patch-configure.diff | 16 +--
.../files/patch-gio_gdbusprivate.c.diff | 8 +-
devel/glib2-devel/files/patch-glib-gmain.c.diff | 6 +-
6 files changed, 91 insertions(+), 90 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 4883ba2..2829b2b 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.53.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.53.3
</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,8 +28,8 @@ 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 5714bbaf70a5269cdee631c7e1917849752f0838 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ada8e2b22f52de1950dd327bdef80a7e41e6da5ddc85fb81d9a8439e9dff8e0d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4feaf01f8bf07142dad041b62c076051aaffec2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ad727874057d369bf5f77f3ed32e2c50488672c99e62ee701a7f0ffdc47381a1
</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 9757dba..fea2a38 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.old 2017-05-11 16:27:24.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in 2017-05-11 16:31:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -704,6 +704,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.in.orig 2017-06-24 05:44:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h.in 2017-06-24 05:45:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -713,6 +713,13 @@
</span> /* Use w32 threads */
#undef THREADS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +54,9 @@ 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.old 2017-05-11 16:27:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-05-11 16:31:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -722,6 +722,10 @@ LIBMOUNT_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-06-24 05:44:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-06-24 05:45:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -722,6 +722,10 @@
</span> LIBMOUNT_CFLAGS
LIBELF_LIBS
LIBELF_CFLAGS
<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 @@ with_gio_module_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -999,6 +1003,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 @@ Optional Packages:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1731,6 +1736,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;'>-@@ -26181,6 +26188,49 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26252,6 +26259,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;'>-@@ -29583,6 +29633,14 @@ if test -z "${HAVE_FAM_TRUE}" && test -z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29698,6 +29748,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,9 +149,9 @@ 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.old 2017-05-11 16:27:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.in 2017-05-11 16:31:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,55 +160,65 @@ TESTS = $(am__EXEEXT_2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/Makefile.in.orig 2017-06-24 05:44:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.in 2017-06-24 05:45:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,55 +160,65 @@
</span> @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_installed_test_data)
@ENABLE_INSTALLED_TESTS_TRUE@am__append_13 = $(test_ltlibraries) $(installed_test_ltlibraries)
@ENABLE_INSTALLED_TESTS_TRUE@am__append_14 = $(installed_test_meta_DATA)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,7 +249,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</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 @@ am__installdirs = "$(DESTDIR)$(installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -273,8 +283,9 @@
</span> LTLIBRARIES = $(installed_test_LTLIBRARIES) $(lib_LTLIBRARIES) \
$(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,7 +261,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> @HAVE_LIBMOUNT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
am__libgio_2_0_la_SOURCES_DIST = gappinfo.c gappinfoprivate.h \
gasynchelper.c gasynchelper.h gasyncinitable.c gasyncresult.c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -359,25 +370,25 @@ am__libgio_2_0_la_SOURCES_DIST = gappinf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -359,26 +370,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;'>@@ -274,16 +274,17 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> - gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
- gcontenttypeprivate.h gfdonotificationbackend.c \
- ggtknotificationbackend.c gportalnotificationbackend.c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- gdocumentportal.c gdocumentportal.h gportalsupport.c \
</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.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;'>-- gwin32registrykey.c gwin32registrykey.h gwin32mount.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gdocumentportal.c gdocumentportal.h gopenuriportal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gopenuriportal.h gportalsupport.c gportalsupport.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gnetworkmonitorportal.c gnetworkmonitorportal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gproxyresolverportal.c gproxyresolverportal.h xdp-dbus.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xdp-dbus.h gcocoanotificationbackend.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gdbusdaemon.h gdbus-daemon-generated.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gdbus-daemon-generated.h gwin32registrykey.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gwin32registrykey.h gwin32mount.c gwin32mount.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gwin32volumemonitor.c gwin32volumemonitor.h \
</span> + gdesktopappinfo.c gosxappinfo.c gcontenttype-win32.c \
+ gosxcontenttype.c gcontenttype.c gfiledescriptorbased.c \
+ gunixconnection.c gunixcredentialsmessage.c gunixfdlist.c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,20 +294,20 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> + gunixoutputstream.c gcontenttypeprivate.h \
+ gfdonotificationbackend.c ggtknotificationbackend.c \
+ gportalnotificationbackend.c gdocumentportal.c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdocumentportal.h gportalsupport.c gportalsupport.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gnetworkmonitorportal.c gnetworkmonitorportal.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gproxyresolverportal.c gproxyresolverportal.h xdp-dbus.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xdp-dbus.h gcocoanotificationbackend.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdbusdaemon.h gdbus-daemon-generated.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdbus-daemon-generated.h gwin32registrykey.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gwin32registrykey.h gwin32mount.c gwin32mount.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gwin32volumemonitor.c gwin32volumemonitor.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gdocumentportal.h gopenuriportal.c gopenuriportal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gportalsupport.c gportalsupport.h gnetworkmonitorportal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gnetworkmonitorportal.h gproxyresolverportal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gproxyresolverportal.h xdp-dbus.c xdp-dbus.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gcocoanotificationbackend.c gnetworkmonitornetlink.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gnetworkmonitornetlink.h gnetworkmonitornm.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gdbus-daemon-generated.c gdbus-daemon-generated.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gwin32registrykey.c gwin32registrykey.h gwin32mount.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
</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;'>-@@ -523,24 +534,29 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -524,24 +534,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;'>@@ -350,9 +351,9 @@ 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;'>-@@ -557,17 +573,17 @@ am__objects_15 = libgio_2_0_la-gnetworkm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@ libgio_2_0_la-gportalnotificationbackend.lo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,17 +574,17 @@
</span> @OS_UNIX_TRUE@ libgio_2_0_la-gdocumentportal.lo \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ @OS_UNIX_TRUE@ libgio_2_0_la-gopenuriportal.lo \
</span> @OS_UNIX_TRUE@ libgio_2_0_la-gportalsupport.lo \
-@OS_UNIX_TRUE@ $(am__objects_15) $(am__objects_1) \
-@OS_UNIX_TRUE@ $(am__objects_16) $(am__objects_17)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,7 +375,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;'>-@@ -575,16 +591,16 @@ am__objects_22 = libgio_2_0_la-gvdb-read
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -577,16 +592,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;'>@@ -399,7 +400,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;'>-@@ -723,9 +739,11 @@ DATA = $(completion_DATA) $(dist_its_DAT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -725,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;'>@@ -413,7 +414,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;'>-@@ -1219,12 +1237,12 @@ NULL =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1221,12 +1238,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;'>@@ -429,7 +430,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;'>-@@ -1285,7 +1303,7 @@ installed_test_SCRIPTS = $(am__append_11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1287,7 +1304,7 @@
</span> nobase_installed_test_DATA = $(am__append_12)
noinst_LTLIBRARIES = $(am__append_2)
noinst_SCRIPTS = $(am__append_4)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,7 +439,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> check_LTLIBRARIES = $(am__append_6)
check_SCRIPTS = $(am__append_8)
check_DATA = $(am__append_9)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1313,8 +1331,9 @@ all_test_ltlibs = $(test_ltlibraries) $(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1315,8 +1332,9 @@
</span> @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
@ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,7 +451,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
AM_CPPFLAGS = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1404,8 +1423,8 @@ settings_base_sources = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1406,8 +1424,8 @@
</span> gsettings-mapping.c \
gsettings.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,7 +462,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> @OS_WIN32_TRUE@win32_settings_sources = \
@OS_WIN32_TRUE@ gregistrysettingsbackend.h \
@OS_WIN32_TRUE@ gregistrysettingsbackend.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1491,14 +1510,16 @@ local_sources = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1493,14 +1511,16 @@
</span> thumbnail-verify.c \
$(NULL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -486,16 +487,16 @@ 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;'>-@@ -1511,7 +1532,7 @@ contenttype_sources = $(am__append_35) $
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@ gportalnotificationbackend.c gdocumentportal.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_UNIX_TRUE@ gdocumentportal.h gportalsupport.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1514,7 +1534,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @OS_UNIX_TRUE@ gdocumentportal.h gopenuriportal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @OS_UNIX_TRUE@ gopenuriportal.h gportalsupport.c \
</span> @OS_UNIX_TRUE@ gportalsupport.h $(portal_sources) $(NULL) \
-@OS_UNIX_TRUE@ $(am__append_32) $(am__append_33)
+@OS_UNIX_TRUE@ $(am__append_37) $(am__append_38)
@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;'>-@@ -1523,7 +1544,7 @@ contenttype_sources = $(am__append_35) $
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1526,7 +1546,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;'>@@ -504,7 +505,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;'>-@@ -1563,6 +1584,7 @@ win32_more_sources_for_vcproj = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1566,6 +1586,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;'>@@ -512,7 +513,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;'>-@@ -1745,16 +1767,16 @@ libgio_2_0_la_LIBADD = $(top_builddir)/g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1749,16 +1770,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;'>@@ -532,7 +533,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;'>-@@ -3826,13 +3848,6 @@ libgio_2_0_la-gwin32appinfo.lo: gwin32ap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3831,13 +3852,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;'>@@ -546,7 +547,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;'>-@@ -3840,6 +3855,13 @@ libgio_2_0_la-gdesktopappinfo.lo: gdeskt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3845,6 +3859,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;'>@@ -560,8 +561,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.old 2017-05-11 16:25:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2017-05-11 16:30:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2017-06-24 05:44:54.000000000 -0500
</span> @@ -43,12 +43,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -579,7 +580,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 @@ _g_io_modules_ensure_extension_points_re
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -978,7 +979,7 @@
</span> {
registered_extensions = TRUE;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -588,7 +589,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 @@ _g_io_modules_ensure_loaded (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1119,8 +1120,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 bcecd41..a1fc6da 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.old 2017-04-25 12:10:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-05-11 16:30:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1702,6 +1702,31 @@ dnl failure. try libattr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-06-19 20:51:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2017-06-24 05:42:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1712,6 +1712,31 @@
</span> ])
AC_SUBST(XATTR_LIBS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@
</span> dnl ************************
dnl *** check for libelf ***
dnl ************************
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.am.old 2017-03-17 02:12:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.am 2017-05-11 16:30:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,11 @@ include $(top_srcdir)/glib.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/Makefile.am.orig 2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.am 2017-06-24 05:42:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,11 @@
</span> SUBDIRS = gdbus-2.0/codegen
if OS_UNIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@
</span> SUBDIRS += xdgmime
endif
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -251,7 +255,16 @@ SUBDIRS += fam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,7 +255,16 @@
</span> endif
if OS_UNIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,7 @@
</span> platform_libadd += xdgmime/libxdgmime.la
platform_deps += xdgmime/libxdgmime.la
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,7 +316,7 @@ giounixinclude_HEADERS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,7 +318,7 @@
</span> gunixinputstream.h \
gunixoutputstream.h \
gunixsocketaddress.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@
</span> $(NULL)
if HAVE_NETLINK
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,7 +362,13 @@ win32_more_sources_for_vcproj = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,7 +364,13 @@
</span> win32/gwin32filemonitor.c
if OS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,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;'>-@@ -358,6 +377,7 @@ giowin32includedir=$(includedir)/gio-win
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,6 +379,7 @@
</span> giowin32include_HEADERS = \
gwin32inputstream.h \
gwin32outputstream.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +97,7 @@
</span> $(NULL)
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -393,13 +413,16 @@ portal_sources = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -398,13 +418,16 @@
</span> $(xdp_dbus_built_sources) \
$(NULL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,8 +118,8 @@
</span> contenttype_sources += gcontenttype.c
appinfo_sources += gdesktopappinfo.c
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.old 2017-05-11 16:25:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2017-05-11 16:30:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2017-06-24 05:44:54.000000000 -0500
</span> @@ -43,12 +43,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +137,7 @@
</span>
#ifdef HAVE_COCOA
#include <AvailabilityMacros.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -978,7 +979,7 @@ _g_io_modules_ensure_extension_points_re
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -978,7 +979,7 @@
</span> {
registered_extensions = TRUE;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,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 @@ _g_io_modules_ensure_loaded (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1119,8 +1120,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 6a3daed..321c2a7 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-03-18 19:41:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-03-29 21:05:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22669,9 +22669,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-06-19 20:51:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-06-24 05:57:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22792,9 +22792,6 @@
</span> presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
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;'>-@@ -32433,18 +32430,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32625,18 +32622,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;'>-@@ -32456,10 +32467,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32648,10 +32659,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;'>-@@ -32490,18 +32508,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32682,18 +32700,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;'>-@@ -32596,7 +32629,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32788,7 +32821,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;'>-@@ -32606,27 +32641,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32798,27 +32833,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-gio_gdbusprivate.c.diff b/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ce1277c..36c8a25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/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-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gdbusprivate.c 2017-06-24 05:53:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2098,7 +2098,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;'>+@@ -2108,7 +2108,7 @@
</span> NULL))
{
g_propagate_prefixed_error (error, first_error,
<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 c68886e..fb98fd4 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-02-13 09:53:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gmain.c 2017-03-29 21:05:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2786,46 +2786,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gmain.c.orig 2017-06-02 11:55:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gmain.c 2017-06-24 05:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2725,46 +2725,34 @@
</span> g_get_monotonic_time (void)
{
static mach_timebase_info_data_t timebase_info;
</pre><pre style='margin:0'>
</pre>