Update glib2 to 2.60.2

GLib's move to meson from autotools means we are effectively starting
from scratch with non-linux build fixes. Support for python 2 has
also been dropped (given that meson requires python 3). I replaced
sysutils/gio-fam with a build option.

The full lengthy list of changes is available from:

  https://gitlab.gnome.org/GNOME/glib/tags/2.60.2

Some highlights:
* Improve network status detection with NetworkManager (!781)
* Add async GIO API: g_file_query_default_handler_async(), g_app_info_launch_uris_async() (#1249, #1347)
* Add overlay support to g_resources_get_info(). (#1445)
* Add writev() and writev_all() APIs to GOutputStream and GPollableOutputStream,
  and provide implementations of them for many subclasses. (#1431)
* Hide bind mounts from GIO mount listings. (#1271)
* Automatically realign data passed to `g_variant_new_from_bytes()` or
  `g_variant_new_from_data()` if it is not correctly aligned. This prevents
  misaligned accesses on architectures which don’t support them. Callers should
  still aim to correctly align data to get higher performance. (#1342)
* Support `ld -b binary` (on platforms which support it; i.e. Linux) to provide
  large pre-compiled `GResource` resources with a fast compilation time. (#1489+* Drop Python 2 support and require Python 3.4+. See discussion on
  https://mail.gnome.org/archives/desktop-devel-list/2018-July/msg00004.html.
  (!196)
* Various fixes to eliminate thread races, found by thread sanitizer (tsan).

1 files changed, 43 insertions, 64 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 1c90d1a6bfc..1ce67f577b5 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,75 +1,54 @@
-# $NetBSD: Makefile,v 1.245 2019/04/25 07:32:45 maya Exp $
+# $NetBSD: Makefile,v 1.246 2019/06/03 09:53:50 prlw1 Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
-CATEGORIES=		devel gnome
-
-COMMENT=		Some useful routines for C programming (glib2)
-
-USE_TOOLS+=		msgfmt perl:run readlink
-
-PKGCONFIG_OVERRIDE+=	glib-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gmodule-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gmodule-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gmodule-no-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gobject-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gio-windows-2.0.pc.in
-
-FILES_SUBST+=		GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
-FILES_SUBST+=		GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
-FILES_SUBST+=		GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
-FILES_SUBST+=		GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
-
-# gtester is the glib unit testing and reporting framework
-# agc doesn't want glib2 to depend on python so we install it
-# in a broken and useless state.
-CHECK_INTERPRETER_SKIP+=	bin/gtester-report
-CHECK_WRKREF_SKIP+=		bin/gtester-report
-
-# need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.31
-# to avoid pkg-config dependency, explicitly specify pcre location
-CONFIGURE_ARGS+=	PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
-CONFIGURE_ARGS+=	PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
-
-# needs gz_header structure
-BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.2.1
-
-LIBS.SunOS+=		-lnsl -lsocket
-CPPFLAGS.SunOS+=	-DBSD_COMP
-
-.if ${OBJECT_FMT} == "ELF"
-.  if ${OPSYS} == "SunOS"
-.    if empty(ABI:U:M64)
-# Solaris libelf in 32-bit mode does not support largefile.  We patch files
-# individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf
-# after configure disabled it.
-CONFIGURE_ENV+=		LIBELF_LIBS='-lelf'
-.    endif
-.  else
-.    include "../../devel/libelf/buildlink3.mk"
-.  endif
-.endif
-
-# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
-# XXX: package is installed and then fails in the installation phase.
-CONFIGURE_ENV+=	ac_cv_prog_GTKDOC_CHECK= \
-		ac_cv_path_GTKDOC_CHECK_PATH= \
-		ac_cv_path_GTKDOC_REBASE= \
-		ac_cv_path_GTKDOC_MKPDF=
+CATEGORIES=	devel gnome
+COMMENT=	Some useful routines for C programming (glib2)
+
+DISTINFO_FILE=	${.CURDIR}/../../devel/glib2/distinfo
+PATCHDIR=	${.CURDIR}/../../devel/glib2/patches
+
+.include "options.mk"
+
+MESON_ARGS+=	-Dinstalled_tests=false
+# Avoid linux dependency on libmount-dev
+MESON_ARGS+=	-Dlibmount=false
+
+REPLACE_PYTHON+=	gio/gio-querymodules-wrapper.py
+REPLACE_PYTHON+=	gio/tests/gengiotypefuncs.py
+REPLACE_PYTHON+=	gio/tests/static-link.py
+REPLACE_PYTHON+=	glib/update-gtranslit.py
+REPLACE_PYTHON+=	gobject/tests/mkenums.py
+REPLACE_PYTHON+=	tests/gen-casefold-txt.py
+REPLACE_PYTHON+=	tests/gen-casemap-txt.py
+
+BUILD_DEFS+=		VARBASE
+SUBST_CLASSES+=		dbusdb
+SUBST_MESSAGE.dbusdb=	Adjust dbus machine uuid path to dbus package
+SUBST_STAGE.dbusdb=	pre-configure
+SUBST_FILES.dbusdb=	gio/gdbusconnection.c
+SUBST_FILES.dbusdb+=	gio/gdbusprivate.c
+SUBST_FILES.dbusdb+=	po/glib20.pot
+SUBST_FILES.dbusdb+=	po/*.po
+SUBST_SED.dbusdb=	-e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'
+
+SUBST_CLASSES+=		xdg
+SUBST_MESSAGE.xdg=	Adjust XDG_DATA_DIRS so schemas and pixbuf loaders are found
+SUBST_STAGE.xdg=	pre-configure
+SUBST_FILES.xdg=	glib/gcharset.c glib/gutils.c gio/xdgmime/xdgmime.c
+SUBST_SED.xdg=		-e 's,/usr/local/share/:/usr/share/,${PREFIX}/share,'
+SUBST_SED.xdg+=		-e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,'
+SUBST_SED.xdg+=		-e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,'
 
 # 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 "../../lang/python/pyversion.mk"
+TOOL_DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+PYTHON_FOR_BUILD_ONLY= yes
+.include "../../lang/python/application.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"