 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2019/08/20 14:06:46 wiz Exp $
+$NetBSD: distinfo,v 1.5 2019/10/29 09:22:25 adam Exp $
-SHA1 (glib-2.60.6.tar.xz) = b6b9bd8a9fa5fe68f972614d9bbb98a3e67c444d
+SHA1 (glib-2.60.7.tar.xz) = d0b21a9358ef03e9e90bcb8beb878cab21bec4f2
-RMD160 (glib-2.60.6.tar.xz) = b268c9616e72275ec9aa4cc9187be396b454e215
+RMD160 (glib-2.60.7.tar.xz) = 099608f6af4ce4a75fa24673b10f344829831be8
-SHA512 (glib-2.60.6.tar.xz) = 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
+SHA512 (glib-2.60.7.tar.xz) = d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-Size (glib-2.60.6.tar.xz) = 4589516 bytes
+Size (glib-2.60.7.tar.xz) = 4590568 bytes
 SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.261 2019/10/08 10:58:17 prlw1 Exp $
+# $NetBSD: Makefile,v 1.262 2019/10/29 09:22:24 adam Exp $
 .include "Makefile.common"
 CATEGORIES=	devel gnome
 COMMENT=	Some useful routines for C programming (glib2)
 .include "options.mk"
 MESON_ARGS+=	-Dinstalled_tests=false
 # Avoid linux dependency on libmount-dev
 MESON_ARGS+=	-Dlibmount=false
 LDFLAGS.SunOS+=		-lintl -lnsl
 @@ -50,27 +50,21 @@ PKGCONFIG_OVERRIDE+=	output/meson-privat
 PKGCONFIG_OVERRIDE+=	output/meson-private/glib-2.0.pc
 PKGCONFIG_OVERRIDE+=	output/meson-private/gmodule-2.0.pc
 PKGCONFIG_OVERRIDE+=	output/meson-private/gmodule-export-2.0.pc
 PKGCONFIG_OVERRIDE+=	output/meson-private/gmodule-no-export-2.0.pc
 PKGCONFIG_OVERRIDE+=	output/meson-private/gobject-2.0.pc
 PKGCONFIG_OVERRIDE+=	output/meson-private/gthread-2.0.pc
 PKGCONFIG_OVERRIDE_STAGE=	post-configure
 # to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
 TOOL_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=	nococoa
 .if ${OPSYS} != "Darwin"
 PLIST.nococoa=	yes
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,19 +1,19 @@
-# $NetBSD: Makefile.common,v 1.72 2019/09/08 10:43:43 nia Exp $
+# $NetBSD: Makefile.common,v 1.73 2019/10/29 09:22:24 adam Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
-DISTNAME=	glib-2.60.6
+DISTNAME=	glib-2.60.7
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	prlw1@cam.ac.uk
 HOMEPAGE=	https://developer.gnome.org/glib/
 LICENSE=	gnu-lgpl-v2.1
 USE_LANGUAGES=	c c++ c99
 USE_TOOLS+=	msgfmt pkg-config
 # does snprintf %d with pid_t...
 BUILDLINK_TRANSFORM+=	rm:-Werror=format=2

 @@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.106 2019/08/20 14:06:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.107 2019/10/29 09:22:24 adam Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
 ${PLIST.nococoa}bin/gio-launch-desktop
 bin/gio-querymodules
 bin/glib-compile-resources
 bin/glib-compile-schemas
 bin/glib-gettextize
 bin/gobject-query
 bin/gresource
 bin/gsettings
-include/gio-unix-2.0/gio/gdesktopappinfo.h
+${PLIST.nococoa}include/gio-unix-2.0/gio/gdesktopappinfo.h
 include/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/gio-unix-2.0/gio/gunixconnection.h
 include/gio-unix-2.0/gio/gunixcredentialsmessage.h
 include/gio-unix-2.0/gio/gunixfdlist.h
 include/gio-unix-2.0/gio/gunixfdmessage.h
 include/gio-unix-2.0/gio/gunixinputstream.h
 include/gio-unix-2.0/gio/gunixmounts.h
 include/gio-unix-2.0/gio/gunixoutputstream.h
 include/gio-unix-2.0/gio/gunixsocketaddress.h
 include/glib-2.0/gio/gaction.h
 include/glib-2.0/gio/gactiongroup.h
 include/glib-2.0/gio/gactiongroupexporter.h
 include/glib-2.0/gio/gactionmap.h
 @@ -103,26 +103,27 @@ include/glib-2.0/gio/gloadableicon.h
 include/glib-2.0/gio/gmemoryinputstream.h
 include/glib-2.0/gio/gmemoryoutputstream.h
 include/glib-2.0/gio/gmenu.h
 include/glib-2.0/gio/gmenuexporter.h
 include/glib-2.0/gio/gmenumodel.h
 include/glib-2.0/gio/gmount.h
 include/glib-2.0/gio/gmountoperation.h
 include/glib-2.0/gio/gnativevolumemonitor.h
 include/glib-2.0/gio/gnetworkaddress.h
 include/glib-2.0/gio/gnetworking.h
 include/glib-2.0/gio/gnetworkmonitor.h
 include/glib-2.0/gio/gnetworkservice.h
 include/glib-2.0/gio/gnotification.h
 ${PLIST.cocoa}include/glib-2.0/gio/gosxappinfo.h
 include/glib-2.0/gio/goutputstream.h
 include/glib-2.0/gio/gpermission.h
 include/glib-2.0/gio/gpollableinputstream.h
 include/glib-2.0/gio/gpollableoutputstream.h
 include/glib-2.0/gio/gpollableutils.h
 include/glib-2.0/gio/gpropertyaction.h
 include/glib-2.0/gio/gproxy.h
 include/glib-2.0/gio/gproxyaddress.h
 include/glib-2.0/gio/gproxyaddressenumerator.h
 include/glib-2.0/gio/gproxyresolver.h
 include/glib-2.0/gio/gremoteactiongroup.h
 include/glib-2.0/gio/gresolver.h
 include/glib-2.0/gio/gresource.h
 @@ -270,52 +271,52 @@ include/glib-2.0/gobject/gparamspecs.h
 include/glib-2.0/gobject/gsignal.h
 include/glib-2.0/gobject/gsourceclosure.h
 include/glib-2.0/gobject/gtype.h
 include/glib-2.0/gobject/gtypemodule.h
 include/glib-2.0/gobject/gtypeplugin.h
 include/glib-2.0/gobject/gvalue.h
 include/glib-2.0/gobject/gvaluearray.h
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 ${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.6
+lib/libgio-2.0.so.0.6000.7
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6000.6
+lib/libglib-2.0.so.0.6000.7
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6000.6
+lib/libgmodule-2.0.so.0.6000.7
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6000.6
+lib/libgobject-2.0.so.0.6000.7
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6000.6
+lib/libgthread-2.0.so.0.6000.7
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
 lib/pkgconfig/gmodule-2.0.pc
 lib/pkgconfig/gmodule-export-2.0.pc
 lib/pkgconfig/gmodule-no-export-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
 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.6-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.7-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.6-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.7-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
 share/glib-2.0/gdb/gobject_gdb.py
 share/glib-2.0/gettext/po/Makefile.in.in
 share/glib-2.0/schemas/gschema.dtd
 share/glib-2.0/valgrind/glib.supp
 share/locale/af/LC_MESSAGES/glib20.mo
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/an/LC_MESSAGES/glib20.mo
 share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/as/LC_MESSAGES/glib20.mo
 share/locale/ast/LC_MESSAGES/glib20.mo

 @@ -1,31 +1,32 @@
-$NetBSD: distinfo,v 1.254 2019/08/20 14:06:46 wiz Exp $
+$NetBSD: distinfo,v 1.255 2019/10/29 09:22:24 adam Exp $
-SHA1 (glib-2.60.6.tar.xz) = b6b9bd8a9fa5fe68f972614d9bbb98a3e67c444d
+SHA1 (glib-2.60.7.tar.xz) = d0b21a9358ef03e9e90bcb8beb878cab21bec4f2
-RMD160 (glib-2.60.6.tar.xz) = b268c9616e72275ec9aa4cc9187be396b454e215
+RMD160 (glib-2.60.7.tar.xz) = 099608f6af4ce4a75fa24673b10f344829831be8
-SHA512 (glib-2.60.6.tar.xz) = 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
+SHA512 (glib-2.60.7.tar.xz) = d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-Size (glib-2.60.6.tar.xz) = 4589516 bytes
+Size (glib-2.60.7.tar.xz) = 4590568 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 21c806f1a9884000b6a1683bc2fd1276b3c3544f
 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
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
-SHA1 (patch-gio_meson.build) = 56b86a0b8ade34ebd155b2d530a19bf3eac97b76
+SHA1 (patch-gio_meson.build) = 7eb21bd0a0af539f13459f2aeb5e32624ceb93f2
 SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
 SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8
 SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1
 SHA1 (patch-glib_ghash.c) = 938135c3a71199e61d1cd1dffa6e1d63864150d6
 SHA1 (patch-glib_glibconfig.h.in) = 1964b5fb15317e681dad426d4862e3f48c4274f7
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
 SHA1 (patch-glib_gtypes.h) = a659b770c55a8071a6e6afd8a9fccdf723e086e6
-SHA1 (patch-glib_meson.build) = 119e48efd8aaabf06b62c6e1897261b470cf7355
+SHA1 (patch-glib_meson.build) = 6cb2d8eb2d19ef1290df2adde5675b36bf037b22
 SHA1 (patch-glib_tests_hash.c) = e928b22926ad917a7a201882a5105b25533554ae
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8
 SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4
 SHA1 (patch-gmodule_gmodule-dyld.c) = 5adf62970d9cff22d451307aaa0b00d975dab138
 SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
-SHA1 (patch-gobject_meson.build) = 58ee162e44047bf20c66067fd3edbe98cc13af50
+SHA1 (patch-gobject_meson.build) = 3cf17f5a60b2b15e62ad9287a6660e1c7e8af0d9
-SHA1 (patch-meson.build) = 125d98082c9bf2b6403bbda1c12e0fa695031ee6
+SHA1 (patch-meson.build) = 7b734de6bcc2dd78d8b028ba107d15bf89a3ac36
 SHA1 (patch-meson_options.txt) = 23e215e44190a2e701b83e280ce235cf117e14ac

 @@ -1,14 +1,28 @@
-# $NetBSD: options.mk,v 1.21 2019/06/03 09:53:50 prlw1 Exp $
+# $NetBSD: options.mk,v 1.22 2019/10/29 09:22:24 adam Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.glib2
 PKG_SUPPORTED_OPTIONS=	fam
 PKG_SUGGESTED_OPTIONS=
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
 PKG_SUPPORTED_OPTIONS+=	cocoa
 .endif
 .include "../../mk/bsd.options.mk"
 PLIST_VARS+=	cocoa nococoa
 # if this options is enabled, use quartz for gtk{2,3}
 .if !empty(PKG_OPTIONS:Mcocoa)
 MESON_ARGS+=	-Duse_cocoa=true
 PLIST.cocoa=	yes
 .else
 PLIST.nococoa=	yes
 .endif
 PLIST_VARS+=	fam
 .if !empty(PKG_OPTIONS:Mfam)
 MESON_ARGS+=	-Dfam=true
 PLIST.fam=	yes
 .include "../../mk/fam.buildlink3.mk"
 .endif

 @@ -1,29 +1,20 @@
-$NetBSD: patch-gio_meson.build,v 1.5 2019/06/28 19:42:05 schmonz Exp $
+$NetBSD: patch-gio_meson.build,v 1.6 2019/10/29 09:22:24 adam Exp $
 Don't build tests, as have strong dependency on libdl.
 Disable inotify on SunOS.
 Install gio/gdesktopappinfo.h on OS X.
 --- gio/meson.build.orig	2019-06-10 17:47:20.000000000 +0000
 +++ gio/meson.build
@@ -421,6 +421,7 @@ if host_system != 'windows'
        unix_sources += files('gcocoanotificationbackend.m')
      endif
      application_headers += files('gosxappinfo.h')
 +    gio_unix_include_headers += files('gdesktopappinfo.h')
    else
      contenttype_sources += files('gcontenttype.c')
      appinfo_sources += files('gdesktopappinfo.c')
 @@ -758,7 +759,7 @@ gioenumtypes_c = custom_target('gioenumt
  gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h])
  # inotify
 -if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1
 +if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1 and host_system != 'sunos'
    subdir('inotify')
    internal_deps += [ inotify_lib ]
    internal_objects += [inotify_lib.extract_all_objects()]
 @@ -994,4 +995,3 @@ if enable_systemtap
  endif
  subdir('fam')

 @@ -1,32 +1,44 @@
-$NetBSD: patch-meson.build,v 1.5 2019/06/26 10:42:50 prlw1 Exp $
+$NetBSD: patch-meson.build,v 1.6 2019/10/29 09:22:24 adam Exp $
-- Don't insist that python binary is called "python3".
+- On Darwin, optionally use Cocoa (needed for X11 users).
 - Don't insist that Python binary is called "python3".
   (Requires meson >= 0.50.0)
 - Don't install bash completion scripts.
 - Tolerate getxattr not existing (smartOS)
   https://gitlab.gnome.org/GNOME/glib/merge_requests/888
 - Define a newer POSIX, as we build this package with -std=gnu99
 - auto-detect GNU iconv, even if no arguments are passed.
   (by checking if iconv.h might in fact be a gnu one)
 - Ignore __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 as is already done
   for android and linux. PR pkg/54298
---- meson.build.orig	2019-06-10 17:47:20.000000000 +0000
+--- meson.build.orig	2019-07-24 10:52:04.000000000 +0000
 +++ meson.build
-@@ -1570,28 +1570,15 @@ atomictest = '''int main() {
+@@ -643,6 +643,7 @@ if host_system == 'darwin'
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
 +  glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa')
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
@@ -1570,28 +1571,15 @@ atomictest = '''int main() {
+ }
  '''
 -atomicdefine = '''
 -#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
 -#error "compiler has atomic ops, but doesn't define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4"
 -#endif
 -'''
+-
  # We know that we can always use real ("lock free") atomic operations with MSVC
  if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
 -  have_atomic_lock_free = true
 -  if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
 @@ -37,97 +49,97 @@ $NetBSD: patch-meson.build,v 1.5 2019/06
 -  endif
 +  glibconfig_conf.set('G_ATOMIC_LOCK_FREE', true)
  else
 -  have_atomic_lock_free = false
    if host_machine.cpu_family() == 'x86' and cc.links(atomictest, args : '-march=i486')
      error('GLib must be built with -march=i486 or later.')
    endif
 +  glibconfig_conf.set('G_ATOMIC_LOCK_FREE', false)
  endif
 -glibconfig_conf.set('G_ATOMIC_LOCK_FREE', have_atomic_lock_free)
  # === Threads ===
-@@ -1696,14 +1683,14 @@ else
+@@ -1696,14 +1684,14 @@ else
    found_iconv = false
    if iconv_opt == 'libc'
      if cc.has_function('iconv_open')
 -      libiconv = []
 -      found_iconv = true
 -    endif
 -  elif iconv_opt == 'gnu'
 -    if cc.has_header_symbol('iconv.h', 'libiconv_open')
 -      glib_conf.set('USE_LIBICONV_GNU', true)
 -      libiconv = [cc.find_library('iconv')]
 -      found_iconv = true
 +      if cc.has_header_symbol('iconv.h', 'libiconv_open')
 +        glib_conf.set('USE_LIBICONV_GNU', true)
 +	libiconv = [cc.find_library('iconv')]
 +	found_iconv = true
 +      else
 +        libiconv = []
 +        found_iconv = true
 +      endif
      endif
    elif iconv_opt == 'native'
      if cc.has_header_symbol('iconv.h', 'iconv_open')
-@@ -1785,7 +1772,7 @@ endif
+@@ -1785,7 +1773,7 @@ endif
  # proxy-libintl subproject.
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
 -if cc.has_function('ngettext')
 +if cc.has_function('ngettext') and host_system != 'sunos'
    libintl = []
    have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
  else
-@@ -1836,16 +1823,15 @@ if host_system != 'windows' and get_opti
+@@ -1836,16 +1824,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')
 +    glib_conf.set('HAVE_XATTR', 1)
    #failure. try libattr
    elif cc.has_header_symbol('attr/xattr.h', 'getxattr')
      glib_conf.set('HAVE_ATTR_XATTR_H', 1)
      glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_ATTR_XATTR_H')
      xattr_dep = [cc.find_library('xattr')]
 -  else
 -    error('No getxattr implementation found in C library or libxattr')
 +    glib_conf.set('HAVE_XATTR', 1)
    endif
 -  glib_conf.set('HAVE_XATTR', 1)
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -1886,9 +1872,11 @@ elif meson.get_cross_property('have_strl
+@@ -1886,9 +1873,11 @@ elif meson.get_cross_property('have_strl
    glib_conf.set('HAVE_STRLCPY', 1)
  endif
 -python = import('python').find_installation('python3')
 -# used for '#!/usr/bin/env <name>'
 -python_name = 'python3'
 +python = import('python').find_installation('python3', required: false)
 +if not python.found()
 +  python = import('python').find_installation()
 +endif
 +python_name = python.path()
  python_version = python.language_version()
  python_version_req = '>=3.4'
-@@ -1897,7 +1885,7 @@ if not python_version.version_compare(py
+@@ -1897,7 +1886,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_sh = find_program('sh', required : false).found() # For glib-gettextize
  # Some installed tests require a custom environment
-@@ -1906,7 +1894,7 @@ env_program = find_program('env', requir
+@@ -1906,7 +1895,7 @@ env_program = find_program('env', requir
  # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
  if host_system == 'sunos'
    glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1)
 -  glib_conf.set('_XOPEN_SOURCE', 2)
 +  glib_conf.set('_POSIX_C_SOURCE',200809)
    glib_conf.set('__EXTENSIONS__',1)
  endif

 @@ -1,21 +1,31 @@
-$NetBSD: patch-glib_meson.build,v 1.3 2019/06/16 15:28:12 leot Exp $
+$NetBSD: patch-glib_meson.build,v 1.4 2019/10/29 09:22:24 adam Exp $
 - On Darwin, allow building without Cocoa.
 - Don't bother with gtester as it's slated for deprecation anyway:
   https://gitlab.gnome.org/GNOME/glib/issues/1441
 - Don't build tests
---- glib/meson.build.orig	2019-06-10 17:47:20.000000000 +0000
+--- glib/meson.build.orig	2019-07-24 10:52:04.000000000 +0000
 +++ glib/meson.build
@@ -230,7 +230,7 @@ else
    platform_deps = []
  endif
 -if host_system == 'darwin'
 +if host_system == 'darwin' and glib_have_cocoa
    glib_sources += files('gosxutils.m')
  endif
 @@ -324,24 +324,8 @@ if host_system == 'windows'
        include_directories : configinc,
        dependencies : [libglib_dep])
    endif
 -else
 -  gtester = executable('gtester', 'gtester.c',
 -    install : true,
 -    include_directories : configinc,
 -    dependencies : [libglib_dep])
  endif
 -report_conf = configuration_data()
 -report_conf.set('GLIB_VERSION', glib_version)

 @@ -1,15 +1,15 @@
-$NetBSD: patch-gobject_meson.build,v 1.3 2019/06/16 15:28:12 leot Exp $
+$NetBSD: patch-gobject_meson.build,v 1.4 2019/10/29 09:22:24 adam Exp $
 Leave glib-genmarshal and glib-mkenums to devel/glib2-tools.
 --- gobject/meson.build.orig	2019-06-10 17:47:20.000000000 +0000
 +++ gobject/meson.build
 @@ -75,7 +75,7 @@ foreach tool: python_tools
      input : tool + '.in',
      output : tool,
      configuration : python_tools_conf,
 -    install : true,
 +    install : false,
      install_dir : glib_bindir,
+   )