glib2: update to 2.60.6

Overview of changes in GLib 2.60.6
==================================

* Fix various bugs with use of the `GKeyfileSettingsBackend` within flatpaks (!984, !985, #1825)

* Bugs fixed:
 - !993 Backport !984, !985 keyfile/portal fixes to glib-2-60


Overview of changes in GLib 2.60.5
==================================

* Fix implicit use of the `GKeyfileSettingsBackend` (#1822)

* Fix opening a URI using the ‘Open URI’ portal (!968)

* Bugs fixed:
 - !910 Backport !909 “D-Bus auth mechanism improvements” to glib-2-60
 - !949 Backport !945 “Avoid overrunning stack at the end of the varargs.” to glib-2-60
 - !956 Backport !954 “Fix the ISO 15924 code for Manichaean” to glib-2-60
 - !958 gthread: fix minor errno problem in GCond
 - !969 Backport !968 ”Fix typo in request handle” to glib-2-60
 - !977 Backport !974 “Ensure that the keyfile settings backend exists” to glib-2-60

6 files changed, 26 insertions, 27 deletions

diff --git a/devel/gdbus-codegen/distinfo b/devel/gdbus-codegen/distinfo
index 2591a63949e..f5a321ae0e0 100644
--- a/devel/gdbus-codegen/distinfo
+++ b/devel/gdbus-codegen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/06/11 09:15:54 prlw1 Exp $
+$NetBSD: distinfo,v 1.4 2019/08/20 14:06:46 wiz Exp $
 
-SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
-RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
-SHA512 (glib-2.60.4.tar.xz) = 614d25652ec9e8387f7865777e128b7f6fd68ff4a1a000868117cbcf5210b5f6aa476eb2b795a6dde56b997906aeb2157c83308f1421a27c4e379522d0ed0afc
-Size (glib-2.60.4.tar.xz) = 4589384 bytes
+SHA1 (glib-2.60.6.tar.xz) = b6b9bd8a9fa5fe68f972614d9bbb98a3e67c444d
+RMD160 (glib-2.60.6.tar.xz) = b268c9616e72275ec9aa4cc9187be396b454e215
+SHA512 (glib-2.60.6.tar.xz) = 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
+Size (glib-2.60.6.tar.xz) = 4589516 bytes
 SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 1d59ce5337a..85de1b6f1dd 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.257 2019/06/28 19:42:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.258 2019/08/20 14:06:46 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	5
 CATEGORIES=	devel gnome
 COMMENT=	Some useful routines for C programming (glib2)
 
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index b1ad87fa7eb..04ef1c19a71 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.70 2019/06/11 09:15:54 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.71 2019/08/20 14:06:46 wiz Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=	glib-2.60.4
+DISTNAME=	glib-2.60.6
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index a3730ef43d4..eaa458849a8 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.105 2019/06/28 19:42:05 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.106 2019/08/20 14:06:46 wiz Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -280,19 +280,19 @@ ${PLIST.fam}lib/gio/modules/libgiofam.so
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
-lib/libgio-2.0.so.0.6000.4
+lib/libgio-2.0.so.0.6000.6
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6000.4
+lib/libglib-2.0.so.0.6000.6
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6000.4
+lib/libgmodule-2.0.so.0.6000.6
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6000.4
+lib/libgobject-2.0.so.0.6000.6
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6000.4
+lib/libgthread-2.0.so.0.6000.6
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -304,8 +304,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.4-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.4-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.6-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.6-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 004eab14db5..f5e2abaec61 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.253 2019/06/28 19:42:05 schmonz Exp $
+$NetBSD: distinfo,v 1.254 2019/08/20 14:06:46 wiz Exp $
 
-SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
-RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
-SHA512 (glib-2.60.4.tar.xz) = 614d25652ec9e8387f7865777e128b7f6fd68ff4a1a000868117cbcf5210b5f6aa476eb2b795a6dde56b997906aeb2157c83308f1421a27c4e379522d0ed0afc
-Size (glib-2.60.4.tar.xz) = 4589384 bytes
+SHA1 (glib-2.60.6.tar.xz) = b6b9bd8a9fa5fe68f972614d9bbb98a3e67c444d
+RMD160 (glib-2.60.6.tar.xz) = b268c9616e72275ec9aa4cc9187be396b454e215
+SHA512 (glib-2.60.6.tar.xz) = 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
+Size (glib-2.60.6.tar.xz) = 4589516 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 21c806f1a9884000b6a1683bc2fd1276b3c3544f
-SHA1 (patch-gio_giomodule.c) = 0715e77fa97f90631c77e9a2cfd54b74698522e2
+SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
diff --git a/devel/glib2/patches/patch-gio_giomodule.c b/devel/glib2/patches/patch-gio_giomodule.c
index 122ce035ebc..c14444a84c6 100644
--- a/devel/glib2/patches/patch-gio_giomodule.c
+++ b/devel/glib2/patches/patch-gio_giomodule.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-gio_giomodule.c,v 1.5 2019/06/06 11:05:12 adam Exp $
+$NetBSD: patch-gio_giomodule.c,v 1.6 2019/08/20 14:06:46 wiz Exp $
 
 Disable inotify on SunOS.
 
---- gio/giomodule.c.orig	2019-05-03 13:43:28.000000000 +0000
+--- gio/giomodule.c.orig	2019-07-24 10:52:04.000000000 +0000
 +++ gio/giomodule.c
-@@ -1209,7 +1206,7 @@ _g_io_modules_ensure_loaded (void)
-       /* Initialize types from built-in "modules" */
+@@ -1210,7 +1210,7 @@ _g_io_modules_ensure_loaded (void)
        g_type_ensure (g_null_settings_backend_get_type ());
        g_type_ensure (g_memory_settings_backend_get_type ());
+       g_type_ensure (g_keyfile_settings_backend_get_type ());
 -#if defined(HAVE_INOTIFY_INIT1)
 +#if defined(HAVE_INOTIFY_INIT1) && !defined(__sun)
        g_type_ensure (g_inotify_file_monitor_get_type ());