glib2: Update to 2.68.0

Revert to adam's commit

Overview of changes in GLib 2.68.0
==================================

* Bugs fixed:
 - !1987 build: Drop gconstructor_as_data_h usage from glib-compile-schemas
 - !1989 glib.supp: Generalize some suppressions
 - !1992 gbytesicon: Fix error in g_bytes_icon_new() documentation
 - !1994 glocalfileoutputstream: Tidy up error handling
 - !1995 tests: Fix copy/paste error in queue test

* Translation updates:
 - Czech
 - Finnish
 - Italian
 - Korean
 - Lithuanian
 - Polish
 - Romanian
 - Slovenian
 - Turkish

4 files changed, 26 insertions, 25 deletions

diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 5e47295f097..a4c73596c40 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.89 2021/03/23 13:48:27 adam Exp $
+# $NetBSD: Makefile.common,v 1.90 2021/03/30 09:37:51 cirnatdan Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=	glib-2.66.8
+DISTNAME=	glib-2.68.0
 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 b8a9bc213aa..4b2cfc62b88 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.125 2021/03/23 13:48:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.126 2021/03/30 09:37:51 cirnatdan Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -239,6 +239,7 @@ include/glib-2.0/glib/gstdio.h
 include/glib-2.0/glib/gstrfuncs.h
 include/glib-2.0/glib/gstring.h
 include/glib-2.0/glib/gstringchunk.h
+include/glib-2.0/glib/gstrvbuilder.h
 include/glib-2.0/glib/gtestutils.h
 include/glib-2.0/glib/gthread.h
 include/glib-2.0/glib/gthreadpool.h
@@ -282,19 +283,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.6600.8
+lib/libgio-2.0.so.0.6800.0
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6600.8
+lib/libglib-2.0.so.0.6800.0
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6600.8
+lib/libgmodule-2.0.so.0.6800.0
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6600.8
+lib/libgobject-2.0.so.0.6800.0
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6600.8
+lib/libgthread-2.0.so.0.6800.0
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -306,8 +307,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.6600.8-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6600.8-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6800.0-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6800.0-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 2424de9d8ee..bb7f8753fc5 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.281 2021/03/23 13:48:27 adam Exp $
+$NetBSD: distinfo,v 1.282 2021/03/30 09:37:51 cirnatdan Exp $
 
-SHA1 (glib-2.66.8.tar.xz) = 668795cd3c2698a28987fb38d632ff7642ddf377
-RMD160 (glib-2.66.8.tar.xz) = d0cf7cb648c93cfee7288c586960b164d5e85f21
-SHA512 (glib-2.66.8.tar.xz) = d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
-Size (glib-2.66.8.tar.xz) = 4845548 bytes
+SHA1 (glib-2.68.0.tar.xz) = cd51b3d7c99ffbc9bb6b39fa6450fc147385c3cb
+RMD160 (glib-2.68.0.tar.xz) = 8843183c417ffe664a935d5ba229af4b5d8328bd
+SHA512 (glib-2.68.0.tar.xz) = dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
+Size (glib-2.68.0.tar.xz) = 4938804 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
 SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
@@ -25,5 +25,5 @@ SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
 SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
-SHA1 (patch-meson.build) = 783271f7be5ac122c18e29b2b6c1b950216d18a1
+SHA1 (patch-meson.build) = f186c7e8ab2c5ba779a1227ae75b15adc0ea17f9
 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
diff --git a/devel/glib2/patches/patch-meson.build b/devel/glib2/patches/patch-meson.build
index b749f1c1000..46f6c2d63ea 100644
--- a/devel/glib2/patches/patch-meson.build
+++ b/devel/glib2/patches/patch-meson.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.13 2021/03/23 13:48:27 adam Exp $
+$NetBSD: patch-meson.build,v 1.14 2021/03/30 09:37:51 cirnatdan Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -12,9 +12,9 @@ $NetBSD: patch-meson.build,v 1.13 2021/03/23 13:48:27 adam Exp $
 
 - Define a newer POSIX, as we build this package with -std=gnu99
 
---- meson.build.orig	2021-03-18 13:47:48.000000000 +0000
+--- meson.build.orig	2021-03-18 13:28:31.000000000 +0000
 +++ meson.build
-@@ -756,6 +756,7 @@ if host_system == 'darwin'
+@@ -773,6 +773,7 @@ if host_system == 'darwin'
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -22,7 +22,7 @@ $NetBSD: patch-meson.build,v 1.13 2021/03/23 13:48:27 adam Exp $
  
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
-@@ -2003,7 +2004,7 @@ endif
+@@ -2038,7 +2039,7 @@ endif
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
  libintl_deps = []
@@ -31,7 +31,7 @@ $NetBSD: patch-meson.build,v 1.13 2021/03/23 13:48:27 adam Exp $
    have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
  else
    # First just find the bare library.
-@@ -2076,16 +2077,15 @@ if host_system != 'windows' and get_opti
+@@ -2111,16 +2112,15 @@ if host_system != 'windows' and get_opti
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
      glib_conf.set('HAVE_SYS_XATTR_H', 1)
      glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H')
@@ -50,7 +50,7 @@ $NetBSD: patch-meson.build,v 1.13 2021/03/23 13:48:27 adam Exp $
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2185,9 +2185,11 @@ endif
+@@ -2220,9 +2220,11 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
@@ -65,16 +65,16 @@ $NetBSD: patch-meson.build,v 1.13 2021/03/23 13:48:27 adam Exp $
  
  python_version = python.language_version()
  python_version_req = '>=3.5'
-@@ -2196,7 +2198,7 @@ if not python_version.version_compare(py
+@@ -2231,7 +2233,7 @@ if not python_version.version_compare(py
  endif
  
  # Determine which user environment-dependent files that we want to install
 -have_bash = find_program('bash', required : false).found() # For completion scripts
 +have_bash = false
+ bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
  have_sh = find_program('sh', required : false).found() # For glib-gettextize
  
- # Some installed tests require a custom environment
-@@ -2204,8 +2206,7 @@ env_program = find_program('env', requir
+@@ -2240,8 +2242,7 @@ env_program = find_program('env', requir
  
  # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
  if host_system == 'sunos'