glib2: updated to 2.64.2

GLib 2.64.2

* Bugs fixed:
 - Glib uses _Static_assert in C++17 mode
 - gdbus error messages contains mixed up body and head signatures
 - Backport !1420 “gmacros.h: avoid using _Static_assert in C++17 mode” to glib-2-64
 - Backport various patches to glib-2-64
  - docs: Fix configuration with gtk_doc=true and installed_tests=false
  - Add missing 'extern' to the dllexport version of GLIB_VAR/GOBJECT_VAR
  - Fix arch detection ifdefs in glib/valgrind.h
  - glib-unix.c: fix heap corruption in g_unix_get_passwd_entry
  - docs: Mention new gio tool options
  - gdbusmessage: Fix swapped signatures in error messages
 - Backport “gfile: Fallback to fast-content-type if content-type is not set” to glib-2-64

* Translation updates:
 - Hebrew
 - Romanian
 - Ukrainian

6 files changed, 21 insertions, 39 deletions

diff --git a/devel/gdbus-codegen/distinfo b/devel/gdbus-codegen/distinfo
index a38600d691f..46d46bfa2e8 100644
--- a/devel/gdbus-codegen/distinfo
+++ b/devel/gdbus-codegen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2020/03/15 19:51:30 wiz Exp $
+$NetBSD: distinfo,v 1.11 2020/04/12 10:39:32 adam Exp $
 
-SHA1 (glib-2.64.1.tar.xz) = 5164418cd9911bf1d0f0790da9a14751f7c2de51
-RMD160 (glib-2.64.1.tar.xz) = a748d860acd66a3d299a2add2c40251b6c97ad78
-SHA512 (glib-2.64.1.tar.xz) = 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
-Size (glib-2.64.1.tar.xz) = 4758548 bytes
+SHA1 (glib-2.64.2.tar.xz) = 50e0ef5a45cc3d8117aa74d2aa01f216157ad682
+RMD160 (glib-2.64.2.tar.xz) = 87c3b47f3d1567de5ecba5f3b884767be232a8e6
+SHA512 (glib-2.64.2.tar.xz) = c65adb76f4a03c19f2df186dde49724135975ec6cd059efca5d753e7459f77925657b1fb6fc4ff0d09b2461b2f6e58c9710fc8cde0a5d648ba0d68ccfef1ec57
+Size (glib-2.64.2.tar.xz) = 4760436 bytes
 SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 4cdd189ac37..89b5d23e9b8 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.271 2020/04/08 12:22:10 prlw1 Exp $
+# $NetBSD: Makefile,v 1.272 2020/04/12 10:39:31 adam 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 5e845041a4e..5b50d4b9de9 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.79 2020/03/15 19:51:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.80 2020/04/12 10:39:31 adam Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=	glib-2.64.1
+DISTNAME=	glib-2.64.2
 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 31fd85fa41f..f0449c2b839 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.115 2020/03/15 19:51:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.116 2020/04/12 10:39:31 adam Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -282,19 +282,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.6400.1
+lib/libgio-2.0.so.0.6400.2
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6400.1
+lib/libglib-2.0.so.0.6400.2
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6400.1
+lib/libgmodule-2.0.so.0.6400.2
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6400.1
+lib/libgobject-2.0.so.0.6400.2
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6400.1
+lib/libgthread-2.0.so.0.6400.2
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -306,8 +306,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.6400.1-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6400.1-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6400.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6400.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 6f9da90efea..fc0bb76b1c7 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.270 2020/03/15 19:51:30 wiz Exp $
+$NetBSD: distinfo,v 1.271 2020/04/12 10:39:31 adam Exp $
 
-SHA1 (glib-2.64.1.tar.xz) = 5164418cd9911bf1d0f0790da9a14751f7c2de51
-RMD160 (glib-2.64.1.tar.xz) = a748d860acd66a3d299a2add2c40251b6c97ad78
-SHA512 (glib-2.64.1.tar.xz) = 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
-Size (glib-2.64.1.tar.xz) = 4758548 bytes
+SHA1 (glib-2.64.2.tar.xz) = 50e0ef5a45cc3d8117aa74d2aa01f216157ad682
+RMD160 (glib-2.64.2.tar.xz) = 87c3b47f3d1567de5ecba5f3b884767be232a8e6
+SHA512 (glib-2.64.2.tar.xz) = c65adb76f4a03c19f2df186dde49724135975ec6cd059efca5d753e7459f77925657b1fb6fc4ff0d09b2461b2f6e58c9710fc8cde0a5d648ba0d68ccfef1ec57
+Size (glib-2.64.2.tar.xz) = 4760436 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
 SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
@@ -17,7 +17,6 @@ SHA1 (patch-gio_tests_meson.build) = 38fbe56f310545163623c5dbd9ba1f8a25e4d928
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
-SHA1 (patch-glib_gmacros.h) = b2737b6b089556ca9bb54176a41371042e329b9c
 SHA1 (patch-glib_gmain.c) = a50bf85d640d63bb901ad26afca933df52e6ccbd
 SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
 SHA1 (patch-glib_meson.build) = 8a45f4e32d9db8c0406908bef332ec81237d0cdf
diff --git a/devel/glib2/patches/patch-glib_gmacros.h b/devel/glib2/patches/patch-glib_gmacros.h
deleted file mode 100644
index a642517386f..00000000000
--- a/devel/glib2/patches/patch-glib_gmacros.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-glib_gmacros.h,v 1.2 2019/12/29 19:58:47 triaxx Exp $
-
-* on some compilers __STDC_VERSION__ is defined when using c++
-  but _Static_assert is not available
-
---- glib/gmacros.h.orig	2019-12-06 12:21:18.948881370 +0000
-+++ glib/gmacros.h
-@@ -734,7 +734,7 @@
- #ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */
- #define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2
- #define G_PASTE(identifier1,identifier2)      G_PASTE_ARGS (identifier1, identifier2)
--#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-+#if defined(__STDC_VERSION__) && !defined(__cplusplus) && __STDC_VERSION__ >= 201112L
- #define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false")
- #elif (defined(__cplusplus) && __cplusplus >= 201103L) || \
-       (defined(__cplusplus) && defined (_MSC_VER) && (_MSC_VER >= 1600)) || \