glib2: update to 2.56.2.

Overview of changes in GLib 2.56.2
==================================

* Support version 2 of the NetworkMonitor portal interface

* Bug fixes:
 740791 gio: cannot specify the source when joining a multicast group...
 755721 g_inotify_file_monitor_start called with nullpointer for dirn...
 773435 After g_get_home_dir() fails, a second use deadlocks
 793727 Use-after-free in emit_network_changed() of gnetworkmonitorba...
 794380 Build failure of gcocoanotificationbackend.c on OS X < 10.9
 794801 /network-monitor/add_networks fails if there is a proxy and g...
 795138 gobject build failure with gcc <= 4.7
 795234 Fix Jenkins CI build failures for network tests
 795406 Glib fails to build for Android
 795429 glib-genmarshal shows redundant "time" warning message agains...
 795711 gitlab-ci: update meson
 795735 Fix comparison for GVariant property values
 795802 gdbus-codegen doesn't accept --output-directory with --output...
 #1240 W32: g_get_system_data_dirs() works differently for C++ applic...
#1401 g_clear_handle_id: clear_func is nullable, despite documentatin...
#1452 GFileInfo: unable to retrieve correct modification time of link...
#1458 g_volume_get_mount returns NULL value after g_volume_mount_fini...

* Translation updates
 Russian
 Slovenian

7 files changed, 68 insertions, 93 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 2d8958752fb..2ac4113ddbe 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.240 2018/05/21 08:39:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.241 2018/08/19 18:32:27 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		1
 CATEGORIES=		devel gnome
 
 COMMENT=		Some useful routines for C programming (glib2)
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 37edd2365f2..5ec05d9fb8d 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2018/08/01 17:43:25 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.66 2018/08/19 18:32:27 wiz Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -7,7 +7,7 @@
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=	glib-2.56.1
+DISTNAME=	glib-2.56.2
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 CATEGORIES=	# empty; redefined in Makefile
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index f9ee5c2b79d..f990e56988b 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.100 2018/05/21 08:39:38 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.101 2018/08/19 18:32:27 wiz Exp $
 bin/gapplication
 bin/gdbus
 bin/gio
@@ -294,8 +294,8 @@ share/bash-completion/completions/gapplication
 share/bash-completion/completions/gdbus
 share/bash-completion/completions/gresource
 share/bash-completion/completions/gsettings
-share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5600.1-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5600.1-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5600.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5600.2-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 70fb71265fc..c535af991ce 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.234 2018/08/01 17:43:25 jperkin Exp $
+$NetBSD: distinfo,v 1.235 2018/08/19 18:32:27 wiz Exp $
 
-SHA1 (glib-2.56.1.tar.xz) = 4db098c15b9d57c37bb504a6f58ebe717994e6f2
-RMD160 (glib-2.56.1.tar.xz) = da4e45bf52d28b610a71bed8b4331bfb0b5c8d56
-SHA512 (glib-2.56.1.tar.xz) = 7e96cc23f3fa42a41b1974ae8fa2a7b123449643f265763d464620afcb011668e2de013ed2a6e5f13b6bd1bf3ab8eab43c05bf4a8ee0d99b7808767ab4fa69f4
-Size (glib-2.56.1.tar.xz) = 8028716 bytes
+SHA1 (glib-2.56.2.tar.xz) = 8b18a92f81a8d033abfb43a628bae3bbaf71800c
+RMD160 (glib-2.56.2.tar.xz) = 8fe9fd51a84ebe0f61b5cb2ab97325baa51c4eb3
+SHA512 (glib-2.56.2.tar.xz) = 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
+Size (glib-2.56.2.tar.xz) = 8041756 bytes
 SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
 SHA1 (patch-aa) = 5aac049588b3f2cb63d86259cf9ebeed61081c52
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
@@ -15,13 +15,12 @@ SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
 SHA1 (patch-ak) = a7dd9b100b05424a76476754c2ee9896b5ae6d26
 SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = e8bd585b4865ebac574de895c05531c8ec1773c1
+SHA1 (patch-an) = 47986cfa2374ad4a89887bee5896d477a31f651f
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
-SHA1 (patch-cl) = abe77225b2013b40d48a419b58ef4970165d0398
+SHA1 (patch-cl) = 58e5b4a3e8cf0750ceadba30e379954d800f77f7
 SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
 SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050
-SHA1 (patch-gio_gfile.c) = 70ab8e438358c917958ef81c18f9f1d0c0ce37ff
 SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa
 SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
index a695f8e3d41..26bf7f72339 100644
--- a/devel/glib2/patches/patch-an
+++ b/devel/glib2/patches/patch-an
@@ -1,11 +1,11 @@
-$NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
+$NetBSD: patch-an,v 1.19 2018/08/19 18:32:27 wiz Exp $
 
 - Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
 - Don't compile tests as they include gdbus-codegen tests.
 - Don't install completion data.
 - Re-enable gdesktopappinfo on Darwin.
 
---- gio/Makefile.in.orig	2018-04-07 02:37:14.000000000 +0000
+--- gio/Makefile.in.orig	2018-08-17 00:27:41.000000000 +0000
 +++ gio/Makefile.in
 @@ -175,7 +175,7 @@ TESTS = $(am__EXEEXT_2)
  @HAVE_FAM_TRUE@am__append_27 = fam
@@ -24,19 +24,28 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
 +@OS_UNIX_TRUE@am__append_35 = gcontenttype.c
 +@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
- @OS_COCOA_TRUE@am__append_37 = libgio-objc-2.0.la
- @OS_COCOA_TRUE@am__append_38 = libgio-objc-2.0.la
- @HAVE_LIBMOUNT_TRUE@am__append_39 = $(LIBMOUNT_CFLAGS)
-@@ -202,7 +202,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT)
+ @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__append_37 = \
+ @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@	gcocoanotificationbackend.c
+ 
+@@ -205,7 +205,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT)
  
  # ------------------------------------------------------------------------
  # gapplication(1) tool
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_45 = gapplication
-+@OS_UNIX_TRUE@am__append_45 = gapplication
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_46 = gapplication
++@OS_UNIX_TRUE@am__append_46 = gapplication
  subdir = gio
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
-@@ -526,11 +526,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
+@@ -231,7 +231,7 @@ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = gnetworking.h gio.rc
+ CONFIG_CLEAN_VPATH_FILES =
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
++@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
+ am__installdirs = "$(DESTDIR)$(bindir)" \
+ 	"$(DESTDIR)$(installed_testdir)" \
+ 	"$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" \
+@@ -535,11 +535,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
  	libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
  	$(am__objects_4) $(am__objects_1)
  @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
@@ -50,34 +59,28 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
  am__objects_11 = $(am__objects_9) $(am__objects_10)
  am__objects_12 = libgio_2_0_la-xdp-dbus.lo
  am__objects_13 = libgio_2_0_la-gnetworkmonitorportal.lo \
-@@ -594,12 +593,9 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l
+@@ -603,13 +602,10 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l
  	$(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
  libgio_objc_2_0_la_LIBADD =
  am__libgio_objc_2_0_la_SOURCES_DIST = gnextstepsettingsbackend.c \
 -	gosxcontenttype.c gosxappinfo.c gosxappinfo.h \
  	gcocoanotificationbackend.c
+ @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__objects_23 = libgio_objc_2_0_la-gcocoanotificationbackend.lo
  @OS_COCOA_TRUE@am_libgio_objc_2_0_la_OBJECTS =  \
  @OS_COCOA_TRUE@	libgio_objc_2_0_la-gnextstepsettingsbackend.lo \
 -@OS_COCOA_TRUE@	libgio_objc_2_0_la-gosxcontenttype.lo \
 -@OS_COCOA_TRUE@	libgio_objc_2_0_la-gosxappinfo.lo \
- @OS_COCOA_TRUE@	libgio_objc_2_0_la-gcocoanotificationbackend.lo
+ @OS_COCOA_TRUE@	$(am__objects_23)
  libgio_objc_2_0_la_OBJECTS = $(am_libgio_objc_2_0_la_OBJECTS)
  libgio_objc_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-@@ -607,22 +603,20 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A
- 	$(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) \
+@@ -618,15 +614,15 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A
  	$(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
  @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath =
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
-+@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
- am__EXEEXT_2 =
- @ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2)
- @ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_2)
- PROGRAMS = $(bin_PROGRAMS) $(installed_test_PROGRAMS) \
- 	$(noinst_PROGRAMS)
  am__gapplication_SOURCES_DIST = gapplication-tool.c
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS =  \
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@	gapplication-tool.$(OBJEXT)
-+@OS_UNIX_TRUE@am_gapplication_OBJECTS = gapplication-tool.$(OBJEXT)
++@OS_UNIX_TRUE@am_gapplication_OBJECTS =  \
++@OS_UNIX_TRUE@	gapplication-tool.$(OBJEXT)
  gapplication_OBJECTS = $(am_gapplication_OBJECTS)
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES =  \
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@	libgio-2.0.la \
@@ -85,7 +88,8 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/gmodule/libgmodule-2.0.la \
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(top_builddir)/glib/libglib-2.0.la \
 -@OS_COCOA_FALSE@@OS_UNIX_TRUE@	$(am__DEPENDENCIES_1)
-+@OS_UNIX_TRUE@gapplication_DEPENDENCIES = libgio-2.0.la \
++@OS_UNIX_TRUE@gapplication_DEPENDENCIES =  \
++@OS_UNIX_TRUE@	libgio-2.0.la \
 +@OS_UNIX_TRUE@	$(top_builddir)/gobject/libgobject-2.0.la \
 +@OS_UNIX_TRUE@	$(top_builddir)/gmodule/libgmodule-2.0.la \
 +@OS_UNIX_TRUE@	$(top_builddir)/glib/libglib-2.0.la \
@@ -93,7 +97,7 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
  am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT)
  gdbus_OBJECTS = $(am_gdbus_OBJECTS)
  gdbus_DEPENDENCIES = libgio-2.0.la \
-@@ -945,8 +939,7 @@ am__set_b = \
+@@ -1189,8 +1185,7 @@ am__set_b = \
      *) \
        b='$*';; \
    esac
@@ -103,7 +107,7 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
  am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
  	$(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
  	$(top_srcdir)/glib.mk $(top_srcdir)/test-driver \
-@@ -1050,6 +1043,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+@@ -1294,6 +1289,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
  GTKDOC_MKPDF = @GTKDOC_MKPDF@
  GTKDOC_REBASE = @GTKDOC_REBASE@
  G_LIBS_EXTRA = @G_LIBS_EXTRA@
@@ -111,7 +115,7 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@
  G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@
  G_MODULE_IMPL = @G_MODULE_IMPL@
-@@ -1327,8 +1321,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
+@@ -1571,8 +1567,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
  @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
  
  @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
@@ -122,17 +126,18 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
  @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 = \
-@@ -1793,9 +1787,6 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG
+@@ -2036,8 +2032,8 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG
+ @OS_COCOA_TRUE@libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
  @OS_COCOA_TRUE@libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
- @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES = \
- @OS_COCOA_TRUE@	gnextstepsettingsbackend.c \
--@OS_COCOA_TRUE@	gosxcontenttype.c \
--@OS_COCOA_TRUE@	gosxappinfo.c \
--@OS_COCOA_TRUE@	gosxappinfo.h \
- @OS_COCOA_TRUE@	gcocoanotificationbackend.c
- 
+ @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES =  \
+-@OS_COCOA_TRUE@	gnextstepsettingsbackend.c gosxcontenttype.c \
+-@OS_COCOA_TRUE@	gosxappinfo.c gosxappinfo.h $(am__append_37)
++@OS_COCOA_TRUE@	gnextstepsettingsbackend.c \
++@OS_COCOA_TRUE@	$(am__append_37)
  EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
-@@ -1966,12 +1957,12 @@ gdbus_LDADD = libgio-2.0.la 				\
+ gio_headers = \
+ 	gappinfo.h 		\
+@@ -2206,12 +2202,12 @@ gdbus_LDADD = libgio-2.0.la 				\
  	$(top_builddir)/glib/libglib-2.0.la		\
  	$(NULL)
  
@@ -151,16 +156,16 @@ $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $
  
  completiondir = $(datadir)/bash-completion/completions
  completion_DATA = \
-@@ -2637,8 +2628,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@
+@@ -2877,8 +2873,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ # am--include-marker
  
-@@ -4213,20 +4202,6 @@ libgio_objc_2_0_la-gnextstepsettingsback
+@@ -4459,20 +4453,6 @@ libgio_objc_2_0_la-gnextstepsettingsback
  @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_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gnextstepsettingsbackend.lo `test -f 'gnextstepsettingsbackend.c' || echo '$(srcdir)/'`gnextstepsettingsbackend.c
  
diff --git a/devel/glib2/patches/patch-cl b/devel/glib2/patches/patch-cl
index c0478b2b32f..ce22b9a6cc2 100644
--- a/devel/glib2/patches/patch-cl
+++ b/devel/glib2/patches/patch-cl
@@ -1,11 +1,11 @@
-$NetBSD: patch-cl,v 1.14 2018/05/21 08:39:38 jperkin Exp $
+$NetBSD: patch-cl,v 1.15 2018/08/19 18:32:27 wiz Exp $
 
 - Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
 - Don't compile tests as they include gdbus-codegen tests.
 - Don't install completion data.
 - Re-enable gdesktopappinfo on Darwin.
 
---- gio/Makefile.am.orig	2018-03-12 16:23:37.000000000 +0000
+--- gio/Makefile.am.orig	2018-08-17 00:03:20.000000000 +0000
 +++ gio/Makefile.am
 @@ -1,6 +1,6 @@
  include $(top_srcdir)/glib.mk
@@ -52,11 +52,11 @@ $NetBSD: patch-cl,v 1.14 2018/05/21 08:39:38 jperkin Exp $
  	gnextstepsettingsbackend.c \
 -	gosxcontenttype.c \
 -	gosxappinfo.c \
--	gosxappinfo.h \
+-	gosxappinfo.h
+ if MAC_OS_X_9
+ libgio_objc_2_0_la_SOURCES += \
  	gcocoanotificationbackend.c
- 
- noinst_LTLIBRARIES += libgio-objc-2.0.la
-@@ -890,7 +883,6 @@ gdbus_LDADD = libgio-2.0.la 				\
+@@ -893,7 +886,6 @@ gdbus_LDADD = libgio-2.0.la 				\
  	$(NULL)
  
  if OS_UNIX
@@ -64,7 +64,7 @@ $NetBSD: patch-cl,v 1.14 2018/05/21 08:39:38 jperkin Exp $
  # ------------------------------------------------------------------------
  # gapplication(1) tool
  bin_PROGRAMS += gapplication
-@@ -901,7 +893,6 @@ gapplication_LDADD = libgio-2.0.la 			\
+@@ -904,7 +896,6 @@ gapplication_LDADD = libgio-2.0.la 			\
  	$(top_builddir)/glib/libglib-2.0.la		\
  	$(NULL)
  endif
diff --git a/devel/glib2/patches/patch-gio_gfile.c b/devel/glib2/patches/patch-gio_gfile.c
deleted file mode 100644
index a770be00e9b..00000000000
--- a/devel/glib2/patches/patch-gio_gfile.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-gio_gfile.c,v 1.4 2018/05/26 13:25:55 schmonz Exp $
-
-Fix build on CentOS 6 (at least) with upstream patch for bug 795133.
-
---- gio/gfile.c.orig	2018-03-12 16:23:37.000000000 +0000
-+++ gio/gfile.c
-@@ -3012,6 +3012,7 @@ splice_stream_with_progress (GInputStrea
-   if (!g_unix_open_pipe (buffer, FD_CLOEXEC, error))
-     return FALSE;
- 
-+#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
-   /* Try a 1MiB buffer for improved throughput. If that fails, use the default
-    * pipe size. See: https://bugzilla.gnome.org/791457 */
-   buffer_size = fcntl (buffer[1], F_SETPIPE_SZ, 1024 * 1024);
-@@ -3029,6 +3030,13 @@ splice_stream_with_progress (GInputStrea
-           goto out;
-         }
-     }
-+#else
-+  /* If #F_GETPIPE_SZ isn’t available, assume we’re on Linux < 2.6.35,
-+   * but ≥ 2.6.11, meaning the pipe capacity is 64KiB. Ignore the possibility of
-+   * running on Linux < 2.6.11 (where the capacity was the system page size,
-+   * typically 4KiB) because it’s ancient. See pipe(7). */
-+  buffer_size = 1024 * 64;
-+#endif
- 
-   g_assert (buffer_size > 0);
-