glib2: updated to 2.68.0

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

1 files changed, 10 insertions, 10 deletions

diff --git a/devel/glib2/patches/patch-meson.build b/devel/glib2/patches/patch-meson.build
index b977a6dc6d6..e52fad70ea0 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.11 2020/09/29 10:43:33 prlw1 Exp $
+$NetBSD: patch-meson.build,v 1.12 2021/03/22 06:54:19 adam Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -12,9 +12,9 @@ $NetBSD: patch-meson.build,v 1.11 2020/09/29 10:43:33 prlw1 Exp $
 
 - Define a newer POSIX, as we build this package with -std=gnu99
 
---- meson.build.orig	2020-08-18 10:52:24.985179000 +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.11 2020/09/29 10:43:33 prlw1 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.11 2020/09/29 10:43:33 prlw1 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.11 2020/09/29 10:43:33 prlw1 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.11 2020/09/29 10:43:33 prlw1 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 # 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'