pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
glib2: delete wip/glib2, devel/glib2 is now 2.68.0
Module Name: pkgsrc-wip
Committed By: Dan CÃirnat <cirnatdan%NetBSD.org@localhost>
Pushed By: cirnatdan
Date: Tue Mar 30 11:48:29 2021 +0200
Changeset: e8e5e4eac63fc639daa3d976c64b8f0447c826d3
Modified Files:
gnome-desktop40/Makefile
gnome-shell/Makefile
mutter/Makefile
Removed Files:
glib2/DEINSTALL
glib2/DESCR
glib2/INSTALL
glib2/Makefile
glib2/Makefile.common
glib2/PLIST
glib2/TODO
glib2/buildlink3.mk
glib2/distinfo
glib2/files/modules.tmpl
glib2/files/schemas.tmpl
glib2/hacks.mk
glib2/modules.mk
glib2/options.mk
glib2/patches/patch-al
glib2/patches/patch-am
glib2/patches/patch-gio_gcredentialsprivate.h
glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in
glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build
glib2/patches/patch-gio_giomodule.c
glib2/patches/patch-gio_glib-compile-schemas.c
glib2/patches/patch-gio_glocalfileinfo.c
glib2/patches/patch-gio_gresource-tool.c
glib2/patches/patch-gio_gunixcredentialsmessage.c
glib2/patches/patch-gio_gunixmounts.c
glib2/patches/patch-gio_inotify_inotify-kernel.c
glib2/patches/patch-gio_meson.build
glib2/patches/patch-gio_tests_gdbus-export.c
glib2/patches/patch-gio_tests_meson.build
glib2/patches/patch-glib_gatomic.c
glib2/patches/patch-glib_gatomic.h
glib2/patches/patch-glib_genviron.c
glib2/patches/patch-glib_gspawn.c
glib2/patches/patch-glib_gthread-posix.c
glib2/patches/patch-glib_meson.build
glib2/patches/patch-glib_tests_hash.c
glib2/patches/patch-glib_tests_include.c
glib2/patches/patch-glib_tests_meson.build
glib2/patches/patch-gobject_glib-genmarshal.in
glib2/patches/patch-gobject_glib-mkenums.in
glib2/patches/patch-gobject_meson.build
glib2/patches/patch-meson.build
glib2/patches/patch-meson_options.txt
glib2/schemas.mk
Log Message:
glib2: delete wip/glib2, devel/glib2 is now 2.68.0
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e8e5e4eac63fc639daa3d976c64b8f0447c826d3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
glib2/DEINSTALL | 19 -
glib2/DESCR | 6 -
glib2/INSTALL | 19 -
glib2/Makefile | 82 ----
glib2/Makefile.common | 21 --
glib2/PLIST | 419 ---------------------
glib2/TODO | 1 -
glib2/buildlink3.mk | 25 --
glib2/distinfo | 36 --
glib2/files/modules.tmpl | 18 -
glib2/files/schemas.tmpl | 18 -
glib2/hacks.mk | 44 ---
glib2/modules.mk | 23 --
glib2/options.mk | 28 --
glib2/patches/patch-al | 22 --
glib2/patches/patch-am | 14 -
glib2/patches/patch-gio_gcredentialsprivate.h | 15 -
.../patch-gio_gdbus-2.0_codegen_gdbus-codegen.in | 13 -
.../patch-gio_gdbus-2.0_codegen_meson.build | 29 --
glib2/patches/patch-gio_giomodule.c | 15 -
glib2/patches/patch-gio_glib-compile-schemas.c | 24 --
glib2/patches/patch-gio_glocalfileinfo.c | 15 -
glib2/patches/patch-gio_gresource-tool.c | 18 -
glib2/patches/patch-gio_gunixcredentialsmessage.c | 18 -
glib2/patches/patch-gio_gunixmounts.c | 17 -
glib2/patches/patch-gio_inotify_inotify-kernel.c | 27 --
glib2/patches/patch-gio_meson.build | 15 -
glib2/patches/patch-gio_tests_gdbus-export.c | 70 ----
glib2/patches/patch-gio_tests_meson.build | 83 ----
glib2/patches/patch-glib_gatomic.c | 31 --
glib2/patches/patch-glib_gatomic.h | 25 --
glib2/patches/patch-glib_genviron.c | 20 -
glib2/patches/patch-glib_gspawn.c | 20 -
glib2/patches/patch-glib_gthread-posix.c | 36 --
glib2/patches/patch-glib_meson.build | 33 --
glib2/patches/patch-glib_tests_hash.c | 60 ---
glib2/patches/patch-glib_tests_include.c | 17 -
glib2/patches/patch-glib_tests_meson.build | 28 --
glib2/patches/patch-gobject_glib-genmarshal.in | 13 -
glib2/patches/patch-gobject_glib-mkenums.in | 18 -
glib2/patches/patch-gobject_meson.build | 14 -
glib2/patches/patch-meson.build | 19 -
glib2/patches/patch-meson_options.txt | 18 -
glib2/schemas.mk | 29 --
gnome-desktop40/Makefile | 2 +-
gnome-shell/Makefile | 1 +
mutter/Makefile | 2 +-
47 files changed, 3 insertions(+), 1537 deletions(-)
diffs:
diff --git a/glib2/DEINSTALL b/glib2/DEINSTALL
deleted file mode 100644
index 976d643c21..0000000000
--- a/glib2/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2011/02/20 17:40:54 jmmv Exp $
-#
-# Forcibly remove any auto-generated caches. The cache-regeneration tools
-# should be doing this automatically when there are no more files in the
-# directories they scan, but they don't. And, anyway, we need to do this
-# if we want in-place updates of glib2 to work correctly.
-#
-
-GIO_MODULES_DIR="@GIO_MODULES_DIR@"
-GLIB_SCHEMAS_DIR="@GLIB_SCHEMAS_DIR@"
-
-case ${STAGE} in
-DEINSTALL)
- ${RM} -f "${GIO_MODULES_DIR}/giomodule.cache"
- ${RM} -f "${GLIB_SCHEMAS_DIR}/gschemas.compiled"
- ;;
-esac
diff --git a/glib2/DESCR b/glib2/DESCR
deleted file mode 100644
index 0b160c0cbb..0000000000
--- a/glib2/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-GLib provides the core application building blocks for libraries
-and applications written in C. It provides the core object system
-used in GNOME, the main loop implementation, and a large set of
-utility functions for strings and common data structures.
-
-This package contains GLib version 2.
diff --git a/glib2/INSTALL b/glib2/INSTALL
deleted file mode 100644
index c068471e20..0000000000
--- a/glib2/INSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2011/02/20 17:40:54 jmmv Exp $
-#
-# Generate caches after installing the glib2 package. This is theorically
-# not needed for a fresh install but is required for in-place updates to
-# work correctly.
-
-GIO_MODULES_DIR="@GIO_MODULES_DIR@"
-GIO_QUERYMODULES="@GIO_QUERYMODULES@"
-GLIB_COMPILE_SCHEMAS="@GLIB_COMPILE_SCHEMAS@"
-GLIB_SCHEMAS_DIR="@GLIB_SCHEMAS_DIR@"
-
-case ${STAGE} in
-POST-INSTALL)
- "${GIO_QUERYMODULES}" "${GIO_MODULES_DIR}"
- XDG_DATA_DIRS= "${GLIB_COMPILE_SCHEMAS}" "${GLIB_SCHEMAS_DIR}"
- ;;
-esac
diff --git a/glib2/Makefile b/glib2/Makefile
deleted file mode 100644
index cb62322194..0000000000
--- a/glib2/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# $NetBSD: Makefile,v 1.277 2021/03/22 06:54:19 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=disabled
-.if ${OPSYS} == "FreeBSD"
-MESON_ARGS+= -Db_lundef=false
-.endif
-
-MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/output/gobject:${WRKSRC}/output/gmodule
-
-CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
-LDFLAGS.SunOS+= -liconv -lintl -lnsl -lsocket
-LDFLAGS.FreeBSD+= -liconv
-
-REPLACE_PYTHON+= gio/gio-querymodules-wrapper.py
-REPLACE_PYTHON+= gio/tests/gengiotypefuncs.py
-REPLACE_PYTHON+= gio/tests/memory-monitor-dbus.py.in
-REPLACE_PYTHON+= gio/tests/memory-monitor-portal.py.in
-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
-
-GIO_MODULES_DIR= ${PREFIX}/lib/gio/modules
-OWN_DIRS= ${GIO_MODULES_DIR}
-
-FILES_SUBST+= GIO_MODULES_DIR=${GIO_MODULES_DIR}
-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
-
-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+= 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,'
-
-PKGCONFIG_OVERRIDE+= output/meson-private/gio-2.0.pc
-PKGCONFIG_OVERRIDE+= output/meson-private/gio-unix-2.0.pc
-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
-
-post-extract:
- ${CHMOD} +x ${WRKSRC}/gio/tests/gengiotypefuncs.py
-
-.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"
diff --git a/glib2/Makefile.common b/glib2/Makefile.common
deleted file mode 100644
index 0d95d5e388..0000000000
--- a/glib2/Makefile.common
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile.common,v 1.89 2021/03/23 13:48:27 adam Exp $
-# used by devel/gdbus-codegen/Makefile
-# used by devel/glib2/Makefile
-# used by devel/glib2-tools/Makefile
-
-DISTNAME= glib-2.68.0
-PKGNAME= ${DISTNAME:S/glib/glib2/}
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= prlw1%cam.ac.uk@localhost
-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
-
-PYTHON_VERSIONS_INCOMPATIBLE= 27
diff --git a/glib2/PLIST b/glib2/PLIST
deleted file mode 100644
index 316853b1ad..0000000000
--- a/glib2/PLIST
+++ /dev/null
@@ -1,419 +0,0 @@
-@comment $NetBSD$
-bin/gapplication
-bin/gdbus
-bin/gio
-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
-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
-include/glib-2.0/gio/gappinfo.h
-include/glib-2.0/gio/gapplication.h
-include/glib-2.0/gio/gapplicationcommandline.h
-include/glib-2.0/gio/gasyncinitable.h
-include/glib-2.0/gio/gasyncresult.h
-include/glib-2.0/gio/gbufferedinputstream.h
-include/glib-2.0/gio/gbufferedoutputstream.h
-include/glib-2.0/gio/gbytesicon.h
-include/glib-2.0/gio/gcancellable.h
-include/glib-2.0/gio/gcharsetconverter.h
-include/glib-2.0/gio/gcontenttype.h
-include/glib-2.0/gio/gconverter.h
-include/glib-2.0/gio/gconverterinputstream.h
-include/glib-2.0/gio/gconverteroutputstream.h
-include/glib-2.0/gio/gcredentials.h
-include/glib-2.0/gio/gdatagrambased.h
-include/glib-2.0/gio/gdatainputstream.h
-include/glib-2.0/gio/gdataoutputstream.h
-include/glib-2.0/gio/gdbusactiongroup.h
-include/glib-2.0/gio/gdbusaddress.h
-include/glib-2.0/gio/gdbusauthobserver.h
-include/glib-2.0/gio/gdbusconnection.h
-include/glib-2.0/gio/gdbuserror.h
-include/glib-2.0/gio/gdbusinterface.h
-include/glib-2.0/gio/gdbusinterfaceskeleton.h
-include/glib-2.0/gio/gdbusintrospection.h
-include/glib-2.0/gio/gdbusmenumodel.h
-include/glib-2.0/gio/gdbusmessage.h
-include/glib-2.0/gio/gdbusmethodinvocation.h
-include/glib-2.0/gio/gdbusnameowning.h
-include/glib-2.0/gio/gdbusnamewatching.h
-include/glib-2.0/gio/gdbusobject.h
-include/glib-2.0/gio/gdbusobjectmanager.h
-include/glib-2.0/gio/gdbusobjectmanagerclient.h
-include/glib-2.0/gio/gdbusobjectmanagerserver.h
-include/glib-2.0/gio/gdbusobjectproxy.h
-include/glib-2.0/gio/gdbusobjectskeleton.h
-include/glib-2.0/gio/gdbusproxy.h
-include/glib-2.0/gio/gdbusserver.h
-include/glib-2.0/gio/gdbusutils.h
-include/glib-2.0/gio/gdrive.h
-include/glib-2.0/gio/gdtlsclientconnection.h
-include/glib-2.0/gio/gdtlsconnection.h
-include/glib-2.0/gio/gdtlsserverconnection.h
-include/glib-2.0/gio/gemblem.h
-include/glib-2.0/gio/gemblemedicon.h
-include/glib-2.0/gio/gfile.h
-include/glib-2.0/gio/gfileattribute.h
-include/glib-2.0/gio/gfileenumerator.h
-include/glib-2.0/gio/gfileicon.h
-include/glib-2.0/gio/gfileinfo.h
-include/glib-2.0/gio/gfileinputstream.h
-include/glib-2.0/gio/gfileiostream.h
-include/glib-2.0/gio/gfilemonitor.h
-include/glib-2.0/gio/gfilenamecompleter.h
-include/glib-2.0/gio/gfileoutputstream.h
-include/glib-2.0/gio/gfilterinputstream.h
-include/glib-2.0/gio/gfilteroutputstream.h
-include/glib-2.0/gio/gicon.h
-include/glib-2.0/gio/ginetaddress.h
-include/glib-2.0/gio/ginetaddressmask.h
-include/glib-2.0/gio/ginetsocketaddress.h
-include/glib-2.0/gio/ginitable.h
-include/glib-2.0/gio/ginputstream.h
-include/glib-2.0/gio/gio-autocleanups.h
-include/glib-2.0/gio/gio.h
-include/glib-2.0/gio/gioenums.h
-include/glib-2.0/gio/gioenumtypes.h
-include/glib-2.0/gio/gioerror.h
-include/glib-2.0/gio/giomodule.h
-include/glib-2.0/gio/gioscheduler.h
-include/glib-2.0/gio/giostream.h
-include/glib-2.0/gio/giotypes.h
-include/glib-2.0/gio/glistmodel.h
-include/glib-2.0/gio/gliststore.h
-include/glib-2.0/gio/gloadableicon.h
-include/glib-2.0/gio/gmemoryinputstream.h
-include/glib-2.0/gio/gmemorymonitor.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/gnativesocketaddress.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
-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
-include/glib-2.0/gio/gseekable.h
-include/glib-2.0/gio/gsettings.h
-include/glib-2.0/gio/gsettingsbackend.h
-include/glib-2.0/gio/gsettingsschema.h
-include/glib-2.0/gio/gsimpleaction.h
-include/glib-2.0/gio/gsimpleactiongroup.h
-include/glib-2.0/gio/gsimpleasyncresult.h
-include/glib-2.0/gio/gsimpleiostream.h
-include/glib-2.0/gio/gsimplepermission.h
-include/glib-2.0/gio/gsimpleproxyresolver.h
-include/glib-2.0/gio/gsocket.h
-include/glib-2.0/gio/gsocketaddress.h
-include/glib-2.0/gio/gsocketaddressenumerator.h
-include/glib-2.0/gio/gsocketclient.h
-include/glib-2.0/gio/gsocketconnectable.h
-include/glib-2.0/gio/gsocketconnection.h
-include/glib-2.0/gio/gsocketcontrolmessage.h
-include/glib-2.0/gio/gsocketlistener.h
-include/glib-2.0/gio/gsocketservice.h
-include/glib-2.0/gio/gsrvtarget.h
-include/glib-2.0/gio/gsubprocess.h
-include/glib-2.0/gio/gsubprocesslauncher.h
-include/glib-2.0/gio/gtask.h
-include/glib-2.0/gio/gtcpconnection.h
-include/glib-2.0/gio/gtcpwrapperconnection.h
-include/glib-2.0/gio/gtestdbus.h
-include/glib-2.0/gio/gthemedicon.h
-include/glib-2.0/gio/gthreadedsocketservice.h
-include/glib-2.0/gio/gtlsbackend.h
-include/glib-2.0/gio/gtlscertificate.h
-include/glib-2.0/gio/gtlsclientconnection.h
-include/glib-2.0/gio/gtlsconnection.h
-include/glib-2.0/gio/gtlsdatabase.h
-include/glib-2.0/gio/gtlsfiledatabase.h
-include/glib-2.0/gio/gtlsinteraction.h
-include/glib-2.0/gio/gtlspassword.h
-include/glib-2.0/gio/gtlsserverconnection.h
-include/glib-2.0/gio/gvfs.h
-include/glib-2.0/gio/gvolume.h
-include/glib-2.0/gio/gvolumemonitor.h
-include/glib-2.0/gio/gzlibcompressor.h
-include/glib-2.0/gio/gzlibdecompressor.h
-include/glib-2.0/glib-object.h
-include/glib-2.0/glib-unix.h
-include/glib-2.0/glib.h
-include/glib-2.0/glib/deprecated/gallocator.h
-include/glib-2.0/glib/deprecated/gcache.h
-include/glib-2.0/glib/deprecated/gcompletion.h
-include/glib-2.0/glib/deprecated/gmain.h
-include/glib-2.0/glib/deprecated/grel.h
-include/glib-2.0/glib/deprecated/gthread.h
-include/glib-2.0/glib/galloca.h
-include/glib-2.0/glib/garray.h
-include/glib-2.0/glib/gasyncqueue.h
-include/glib-2.0/glib/gatomic.h
-include/glib-2.0/glib/gbacktrace.h
-include/glib-2.0/glib/gbase64.h
-include/glib-2.0/glib/gbitlock.h
-include/glib-2.0/glib/gbookmarkfile.h
-include/glib-2.0/glib/gbytes.h
-include/glib-2.0/glib/gcharset.h
-include/glib-2.0/glib/gchecksum.h
-include/glib-2.0/glib/gconvert.h
-include/glib-2.0/glib/gdataset.h
-include/glib-2.0/glib/gdate.h
-include/glib-2.0/glib/gdatetime.h
-include/glib-2.0/glib/gdir.h
-include/glib-2.0/glib/genviron.h
-include/glib-2.0/glib/gerror.h
-include/glib-2.0/glib/gfileutils.h
-include/glib-2.0/glib/ggettext.h
-include/glib-2.0/glib/ghash.h
-include/glib-2.0/glib/ghmac.h
-include/glib-2.0/glib/ghook.h
-include/glib-2.0/glib/ghostutils.h
-include/glib-2.0/glib/gi18n-lib.h
-include/glib-2.0/glib/gi18n.h
-include/glib-2.0/glib/giochannel.h
-include/glib-2.0/glib/gkeyfile.h
-include/glib-2.0/glib/glib-autocleanups.h
-include/glib-2.0/glib/glist.h
-include/glib-2.0/glib/gmacros.h
-include/glib-2.0/glib/gmain.h
-include/glib-2.0/glib/gmappedfile.h
-include/glib-2.0/glib/gmarkup.h
-include/glib-2.0/glib/gmem.h
-include/glib-2.0/glib/gmessages.h
-include/glib-2.0/glib/gnode.h
-include/glib-2.0/glib/goption.h
-include/glib-2.0/glib/gpattern.h
-include/glib-2.0/glib/gpoll.h
-include/glib-2.0/glib/gprimes.h
-include/glib-2.0/glib/gprintf.h
-include/glib-2.0/glib/gqsort.h
-include/glib-2.0/glib/gquark.h
-include/glib-2.0/glib/gqueue.h
-include/glib-2.0/glib/grand.h
-include/glib-2.0/glib/grcbox.h
-include/glib-2.0/glib/grefcount.h
-include/glib-2.0/glib/grefstring.h
-include/glib-2.0/glib/gregex.h
-include/glib-2.0/glib/gscanner.h
-include/glib-2.0/glib/gsequence.h
-include/glib-2.0/glib/gshell.h
-include/glib-2.0/glib/gslice.h
-include/glib-2.0/glib/gslist.h
-include/glib-2.0/glib/gspawn.h
-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
-include/glib-2.0/glib/gtimer.h
-include/glib-2.0/glib/gtimezone.h
-include/glib-2.0/glib/gtrashstack.h
-include/glib-2.0/glib/gtree.h
-include/glib-2.0/glib/gtypes.h
-include/glib-2.0/glib/gunicode.h
-include/glib-2.0/glib/guri.h
-include/glib-2.0/glib/gutils.h
-include/glib-2.0/glib/guuid.h
-include/glib-2.0/glib/gvariant.h
-include/glib-2.0/glib/gvarianttype.h
-include/glib-2.0/glib/gversion.h
-include/glib-2.0/glib/gversionmacros.h
-include/glib-2.0/glib/gwin32.h
-include/glib-2.0/gmodule.h
-include/glib-2.0/gobject/gbinding.h
-include/glib-2.0/gobject/gboxed.h
-include/glib-2.0/gobject/gclosure.h
-include/glib-2.0/gobject/genums.h
-include/glib-2.0/gobject/glib-enumtypes.h
-include/glib-2.0/gobject/glib-types.h
-include/glib-2.0/gobject/gmarshal.h
-include/glib-2.0/gobject/gobject-autocleanups.h
-include/glib-2.0/gobject/gobject.h
-include/glib-2.0/gobject/gobjectnotifyqueue.c
-include/glib-2.0/gobject/gparam.h
-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
-lib/glib-2.0/include/glibconfig.h
-lib/libgio-2.0.so
-lib/libgio-2.0.so.0
-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.6800.0
-lib/libgmodule-2.0.so
-lib/libgmodule-2.0.so.0
-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.6800.0
-lib/libgthread-2.0.so
-lib/libgthread-2.0.so.0
-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
-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/bash-completion/completions/gapplication
-share/bash-completion/completions/gdbus
-share/bash-completion/completions/gio
-share/bash-completion/completions/gresource
-share/bash-completion/completions/gsettings
-share/gdb/auto-load/usr/pkg/lib/libglib-2.0.so.0.6800.0-gdb.py
-share/gdb/auto-load/usr/pkg/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
-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
-share/locale/az/LC_MESSAGES/glib20.mo
-share/locale/be/LC_MESSAGES/glib20.mo
-share/locale/be@latin/LC_MESSAGES/glib20.mo
-share/locale/bg/LC_MESSAGES/glib20.mo
-share/locale/bn/LC_MESSAGES/glib20.mo
-share/locale/bn_IN/LC_MESSAGES/glib20.mo
-share/locale/bs/LC_MESSAGES/glib20.mo
-share/locale/ca/LC_MESSAGES/glib20.mo
-share/locale/ca@valencia/LC_MESSAGES/glib20.mo
-share/locale/cs/LC_MESSAGES/glib20.mo
-share/locale/cy/LC_MESSAGES/glib20.mo
-share/locale/da/LC_MESSAGES/glib20.mo
-share/locale/de/LC_MESSAGES/glib20.mo
-share/locale/dz/LC_MESSAGES/glib20.mo
-share/locale/el/LC_MESSAGES/glib20.mo
-share/locale/en@shaw/LC_MESSAGES/glib20.mo
-share/locale/en_CA/LC_MESSAGES/glib20.mo
-share/locale/en_GB/LC_MESSAGES/glib20.mo
-share/locale/eo/LC_MESSAGES/glib20.mo
-share/locale/es/LC_MESSAGES/glib20.mo
-share/locale/et/LC_MESSAGES/glib20.mo
-share/locale/eu/LC_MESSAGES/glib20.mo
-share/locale/fa/LC_MESSAGES/glib20.mo
-share/locale/fi/LC_MESSAGES/glib20.mo
-share/locale/fr/LC_MESSAGES/glib20.mo
-share/locale/fur/LC_MESSAGES/glib20.mo
-share/locale/ga/LC_MESSAGES/glib20.mo
-share/locale/gd/LC_MESSAGES/glib20.mo
-share/locale/gl/LC_MESSAGES/glib20.mo
-share/locale/gu/LC_MESSAGES/glib20.mo
-share/locale/he/LC_MESSAGES/glib20.mo
-share/locale/hi/LC_MESSAGES/glib20.mo
-share/locale/hr/LC_MESSAGES/glib20.mo
-share/locale/hu/LC_MESSAGES/glib20.mo
-share/locale/hy/LC_MESSAGES/glib20.mo
-share/locale/id/LC_MESSAGES/glib20.mo
-share/locale/is/LC_MESSAGES/glib20.mo
-share/locale/it/LC_MESSAGES/glib20.mo
-share/locale/ja/LC_MESSAGES/glib20.mo
-share/locale/ka/LC_MESSAGES/glib20.mo
-share/locale/kk/LC_MESSAGES/glib20.mo
-share/locale/kn/LC_MESSAGES/glib20.mo
-share/locale/ko/LC_MESSAGES/glib20.mo
-share/locale/ku/LC_MESSAGES/glib20.mo
-share/locale/lt/LC_MESSAGES/glib20.mo
-share/locale/lv/LC_MESSAGES/glib20.mo
-share/locale/mai/LC_MESSAGES/glib20.mo
-share/locale/mg/LC_MESSAGES/glib20.mo
-share/locale/mk/LC_MESSAGES/glib20.mo
-share/locale/ml/LC_MESSAGES/glib20.mo
-share/locale/mn/LC_MESSAGES/glib20.mo
-share/locale/mr/LC_MESSAGES/glib20.mo
-share/locale/ms/LC_MESSAGES/glib20.mo
-share/locale/nb/LC_MESSAGES/glib20.mo
-share/locale/nds/LC_MESSAGES/glib20.mo
-share/locale/ne/LC_MESSAGES/glib20.mo
-share/locale/nl/LC_MESSAGES/glib20.mo
-share/locale/nn/LC_MESSAGES/glib20.mo
-share/locale/oc/LC_MESSAGES/glib20.mo
-share/locale/or/LC_MESSAGES/glib20.mo
-share/locale/pa/LC_MESSAGES/glib20.mo
-share/locale/pl/LC_MESSAGES/glib20.mo
-share/locale/ps/LC_MESSAGES/glib20.mo
-share/locale/pt/LC_MESSAGES/glib20.mo
-share/locale/pt_BR/LC_MESSAGES/glib20.mo
-share/locale/ro/LC_MESSAGES/glib20.mo
-share/locale/ru/LC_MESSAGES/glib20.mo
-share/locale/rw/LC_MESSAGES/glib20.mo
-share/locale/si/LC_MESSAGES/glib20.mo
-share/locale/sk/LC_MESSAGES/glib20.mo
-share/locale/sl/LC_MESSAGES/glib20.mo
-share/locale/sq/LC_MESSAGES/glib20.mo
-share/locale/sr/LC_MESSAGES/glib20.mo
-share/locale/sr@ije/LC_MESSAGES/glib20.mo
-share/locale/sr@latin/LC_MESSAGES/glib20.mo
-share/locale/sv/LC_MESSAGES/glib20.mo
-share/locale/ta/LC_MESSAGES/glib20.mo
-share/locale/te/LC_MESSAGES/glib20.mo
-share/locale/tg/LC_MESSAGES/glib20.mo
-share/locale/th/LC_MESSAGES/glib20.mo
-share/locale/tl/LC_MESSAGES/glib20.mo
-share/locale/tr/LC_MESSAGES/glib20.mo
-share/locale/tt/LC_MESSAGES/glib20.mo
-share/locale/ug/LC_MESSAGES/glib20.mo
-share/locale/uk/LC_MESSAGES/glib20.mo
-share/locale/vi/LC_MESSAGES/glib20.mo
-share/locale/wa/LC_MESSAGES/glib20.mo
-share/locale/xh/LC_MESSAGES/glib20.mo
-share/locale/yi/LC_MESSAGES/glib20.mo
-share/locale/zh_CN/LC_MESSAGES/glib20.mo
-share/locale/zh_HK/LC_MESSAGES/glib20.mo
-share/locale/zh_TW/LC_MESSAGES/glib20.mo
diff --git a/glib2/TODO b/glib2/TODO
deleted file mode 100644
index fd6fef9dbc..0000000000
--- a/glib2/TODO
+++ /dev/null
@@ -1 +0,0 @@
-wip/glib2/work/glib-2.58.2/output/gio/glib-compile-resources: Shared object "libgio-2.0.so.0" not found
diff --git a/glib2/buildlink3.mk b/glib2/buildlink3.mk
deleted file mode 100644
index 16cf3df4d4..0000000000
--- a/glib2/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.31 2020/03/08 16:42:24 bsiegert Exp $
-
-BUILDLINK_TREE+= glib2
-
-.if !defined(GLIB2_BUILDLINK3_MK)
-GLIB2_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0
-BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.64.0nb1
-BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
-BUILDLINK_INCDIRS.glib2+= include/glib-2.0
-BUILDLINK_INCDIRS.glib2+= include/gio-unix-2.0
-BUILDLINK_INCDIRS.glib2+= lib/glib-2.0/include
-
-TOOL_DEPENDS+= glib2-tools-[0-9]*:../../devel/glib2-tools
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.endif # GLIB2_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -glib2
diff --git a/glib2/distinfo b/glib2/distinfo
deleted file mode 100644
index ffbea91633..0000000000
--- a/glib2/distinfo
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: distinfo,v 1.281 2021/03/23 13:48:27 adam Exp $
-
-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-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
-SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50
-SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb
-SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050
-SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
-SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
-SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
-SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
-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) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
-SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f
-SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
-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_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
-SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
-SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9
-SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
-SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
-SHA1 (patch-glib_tests_meson.build) = d358bd579eb09655c608106092bdeed8f16ff4d0
-SHA1 (patch-gobject_glib-genmarshal.in) = f21ca416d4eb4ad5a8ce3ffa053f8bcd2be8953a
-SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
-SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
-SHA1 (patch-meson.build) = cef4289d9c63c2a14cad08c3b2c944371e6f6573
-SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
diff --git a/glib2/files/modules.tmpl b/glib2/files/modules.tmpl
deleted file mode 100644
index f909ce496e..0000000000
--- a/glib2/files/modules.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: modules.tmpl,v 1.1 2010/11/17 14:09:55 drochner Exp $
-#
-# Rebuild the GIO modules database.
-#
-
-GIO_MODULES_DIR="@GIO_MODULES_DIR@"
-GIO_QUERYMODULES="@GIO_QUERYMODULES@"
-
-case ${STAGE} in
-POST-INSTALL)
- ${GIO_QUERYMODULES} ${GIO_MODULES_DIR}
- ;;
-POST-DEINSTALL)
- ${GIO_QUERYMODULES} ${GIO_MODULES_DIR}
- ;;
-*)
- ;;
-esac
diff --git a/glib2/files/schemas.tmpl b/glib2/files/schemas.tmpl
deleted file mode 100644
index 33313ea4ce..0000000000
--- a/glib2/files/schemas.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: schemas.tmpl,v 1.1 2011/01/18 10:03:59 jmmv Exp $
-#
-# Recompile the GSettings schemas.
-#
-
-GLIB_SCHEMAS_DIR="@GLIB_SCHEMAS_DIR@"
-GLIB_COMPILE_SCHEMAS="@GLIB_COMPILE_SCHEMAS@"
-
-case "${STAGE}" in
-POST-INSTALL)
- XDG_DATA_DIRS= "${GLIB_COMPILE_SCHEMAS}" "${GLIB_SCHEMAS_DIR}"
- ;;
-POST-DEINSTALL)
- XDG_DATA_DIRS= "${GLIB_COMPILE_SCHEMAS}" "${GLIB_SCHEMAS_DIR}"
- ;;
-*)
- ;;
-esac
diff --git a/glib2/hacks.mk b/glib2/hacks.mk
deleted file mode 100644
index 173b8d8079..0000000000
--- a/glib2/hacks.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: hacks.mk,v 1.10 2013/04/20 09:17:32 obache Exp $
-
-.if !defined(GLIB2_HACKS_MK)
-GLIB2_HACKS_MK= # defined
-
-# Build without optimization. Avoids crash in libgobject on gtk2
-# initialization. Bug is triggered regardless of whether we're using gcc or
-# aCC.
-.if !empty(MACHINE_PLATFORM:MHPUX-*-hppa)
-PKG_HACKS+= hppa-codegen
-CFLAGS:= -O0 ${CFLAGS:C/[+,-]O[0-9]?//g}
-.endif
-
-.if ${OPSYS} == "Darwin"
-CHECK_BUILTIN.libiconv:= yes
-. include "../../converters/libiconv/builtin.mk"
-CHECK_BUILTIN.libiconv:= no
-. if !empty(USE_BUILTIN.iconv:M[Yy][Ee][Ss])
-PKG_HACKS+= darwin-iconv
-SUBST_CLASSES+= iconv
-SUBST_STAGE.iconv= pre-configure
-SUBST_MESSAGE.iconv= Changing libiconv_open to iconv_open.
-SUBST_FILES.iconv= configure
-SUBST_SED.iconv= -e 's,libiconv_open,iconv_open,g'
-. endif
-.endif
-
-# Work around unresolved symbol g_test_config_vars during build
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Msunpro)
-PKG_HACKS+= sunpro-visibility
-CONFIGURE_ARGS+= --disable-visibility
-.endif
-
-#
-# GLib2>=2.36 depends on builtin functions which enabled with i486 and
-# later with GCC.
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5]*-i386)
-GNU_ARCH.i386= i486
-CFLAGS+= -march=i486
-.endif
-
-.endif
diff --git a/glib2/modules.mk b/glib2/modules.mk
deleted file mode 100644
index 517bd78fa4..0000000000
--- a/glib2/modules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: modules.mk,v 1.2 2019/11/03 10:39:12 rillig Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# GIO modules. It takes care of rebuilding the corresponding databases at
-# (de)installation time.
-#
-
-.if !defined(GIO_MODULES_MK)
-GIO_MODULES_MK= # defined
-
-GIO_QUERYMODULES= ${BUILDLINK_PREFIX.glib2}/bin/gio-querymodules
-
-FILES_SUBST+= GIO_MODULES_DIR=${GIO_MODULES_DIR:Q}
-FILES_SUBST+= GIO_QUERYMODULES=${GIO_QUERYMODULES:Q}
-GIO_MODULES_DIR= ${BUILDLINK_PREFIX.glib2}/lib/gio/modules
-INSTALL_TEMPLATES+= ../../devel/glib2/files/modules.tmpl
-DEINSTALL_TEMPLATES+= ../../devel/glib2/files/modules.tmpl
-
-TOOLS_NOOP+= gio-querymodules
-
-.include "../../devel/glib2/buildlink3.mk"
-
-.endif # GIO_MODULES_MK
diff --git a/glib2/options.mk b/glib2/options.mk
deleted file mode 100644
index fd13a9e729..0000000000
--- a/glib2/options.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: options.mk,v 1.22 2019/10/29 09:22:24 adam Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.glib2
-PKG_SUPPORTED_OPTIONS= fam
-
-.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
diff --git a/glib2/patches/patch-al b/glib2/patches/patch-al
deleted file mode 100644
index d7fc5ccb42..0000000000
--- a/glib2/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.9 2018/04/17 08:03:38 wiz Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=790698
-
---- glib/tests/convert.c.orig 2018-02-06 15:44:20.000000000 +0000
-+++ glib/tests/convert.c
-@@ -65,6 +65,7 @@ test_one_half (void)
- gsize bytes_read = 0;
- gsize bytes_written = 0;
- GError *error = NULL;
-+#if 0 /* these tests depend on GNU iconv specific behaviour */
-
- out = g_convert (in_utf8, -1,
- "ISO-8859-1", "UTF-8",
-@@ -100,6 +101,7 @@ test_one_half (void)
- g_assert_cmpint (bytes_written, ==, 1);
- g_assert_cmpstr (out, ==, "a");
- g_free (out);
-+#endif
- }
-
- static void
diff --git a/glib2/patches/patch-am b/glib2/patches/patch-am
deleted file mode 100644
index ae24e2e5b5..0000000000
--- a/glib2/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.9 2012/11/13 21:23:07 adam Exp $
-
---- gio/tests/converter-stream.c.orig 2012-09-03 14:24:05.000000000 +0000
-+++ gio/tests/converter-stream.c
-@@ -1173,7 +1173,9 @@ main (int argc,
- CharsetTest charset_tests[] = {
- { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
- { "/converter-input-stream/charset/latin1->utf8", "ISO-8859-1", "\305rr Sant\351", "UTF-8", "\303\205rr Sant\303\251", 0 },
-+#if 0 /* this depends on GNU iconv specific behaviour */
- { "/converter-input-stream/charset/fallbacks", "UTF-8", "Some characters just don't fit into latin1: πא", "ISO-8859-1", "Some characters just don't fit into latin1: \\CF\\80\\D7\\90", 4 },
-+#endif
- };
-
- gint i;
diff --git a/glib2/patches/patch-gio_gcredentialsprivate.h b/glib2/patches/patch-gio_gcredentialsprivate.h
deleted file mode 100644
index a56a0adf77..0000000000
--- a/glib2/patches/patch-gio_gcredentialsprivate.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gio_gcredentialsprivate.h,v 1.4 2020/09/29 10:43:33 prlw1 Exp $
-
-NetBSD has G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED.
-
---- gio/gcredentialsprivate.h.orig 2020-08-18 10:52:24.847177300 +0000
-+++ gio/gcredentialsprivate.h
-@@ -134,7 +134,7 @@
- #define G_CREDENTIALS_USE_NETBSD_UNPCBID 1
- #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_NETBSD_UNPCBID
- #define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct unpcbid))
--/* #undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED */
-+#define G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED 1
- #define G_CREDENTIALS_SPOOFING_SUPPORTED 1
- #define G_CREDENTIALS_HAS_PID 1
-
diff --git a/glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in b/glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in
deleted file mode 100644
index 1d58e0f88e..0000000000
--- a/glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gio_gdbus-2.0_codegen_gdbus-codegen.in,v 1.1 2017/10/15 08:23:06 prlw1 Exp $
-
-Revert 683809d5 Use env for gdbus-codegen's script
-https://bugzilla.gnome.org/show_bug.cgi?id=788527
-
---- gio/gdbus-2.0/codegen/gdbus-codegen.in.orig 2017-07-15 12:05:03.000000000 +0000
-+++ gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
-+#!@PYTHON@
-
- # GDBus - GLib D-Bus Library
- #
diff --git a/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build b/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build
deleted file mode 100644
index 01e64fccef..0000000000
--- a/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-gio_gdbus-2.0_codegen_meson.build,v 1.2 2019/11/14 11:40:30 wiz Exp $
-
-Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
-
---- gio/gdbus-2.0/codegen/meson.build.orig 2019-10-04 11:44:23.000000000 +0000
-+++ gio/gdbus-2.0/codegen/meson.build
-@@ -17,6 +17,7 @@ gdbus_codegen_conf.set('DATADIR', glib_d
- gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
- output : 'gdbus-codegen',
- install_dir : get_option('bindir'),
-+ install : false,
- configuration : gdbus_codegen_conf
- )
- # Provide tools for others when we're a subproject and they use the Meson GNOME module
-@@ -28,6 +29,7 @@ gdbus_codegen_built_files = []
- gdbus_codegen_built_files += configure_file(input : 'config.py.in',
- output : 'config.py',
- install_dir : codegen_dir,
-+ install : false,
- configuration : gdbus_codegen_conf)
-
- foreach f : gdbus_codegen_files
-@@ -35,5 +37,6 @@ foreach f : gdbus_codegen_files
- # and then install it too so that it can be used after installation
- gdbus_codegen_built_files += configure_file(input : f, output : f,
- install_dir : codegen_dir,
-+ install : false,
- copy : true)
- endforeach
diff --git a/glib2/patches/patch-gio_giomodule.c b/glib2/patches/patch-gio_giomodule.c
deleted file mode 100644
index c14444a84c..0000000000
--- a/glib2/patches/patch-gio_giomodule.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gio_giomodule.c,v 1.6 2019/08/20 14:06:46 wiz Exp $
-
-Disable inotify on SunOS.
-
---- gio/giomodule.c.orig 2019-07-24 10:52:04.000000000 +0000
-+++ gio/giomodule.c
-@@ -1210,7 +1210,7 @@ _g_io_modules_ensure_loaded (void)
- g_type_ensure (g_null_settings_backend_get_type ());
- g_type_ensure (g_memory_settings_backend_get_type ());
- g_type_ensure (g_keyfile_settings_backend_get_type ());
--#if defined(HAVE_INOTIFY_INIT1)
-+#if defined(HAVE_INOTIFY_INIT1) && !defined(__sun)
- g_type_ensure (g_inotify_file_monitor_get_type ());
- #endif
- #if defined(HAVE_KQUEUE)
diff --git a/glib2/patches/patch-gio_glib-compile-schemas.c b/glib2/patches/patch-gio_glib-compile-schemas.c
deleted file mode 100644
index 4d1409986d..0000000000
--- a/glib2/patches/patch-gio_glib-compile-schemas.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-gio_glib-compile-schemas.c,v 1.1 2020/09/18 11:18:29 wiz Exp $
-
-gsettings-desktop-schemas uses deprecated paths and is not going to stop
-anytime soon, see
-https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/issues/27
-
---- gio/glib-compile-schemas.c.orig 2020-08-18 11:06:36.941520700 +0000
-+++ gio/glib-compile-schemas.c
-@@ -1232,6 +1232,7 @@ parse_state_start_schema (ParseState *s
- return;
- }
-
-+#if 0
- if (path && (g_str_has_prefix (path, "/apps/") ||
- g_str_has_prefix (path, "/desktop/") ||
- g_str_has_prefix (path, "/system/")))
-@@ -1244,6 +1245,7 @@ parse_state_start_schema (ParseState *s
- g_printerr ("%s\n", message);
- g_free (message);
- }
-+#endif
-
- state->schema_state = schema_state_new (path, gettext_domain,
- extends, extends_name, list_of);
diff --git a/glib2/patches/patch-gio_glocalfileinfo.c b/glib2/patches/patch-gio_glocalfileinfo.c
deleted file mode 100644
index d1f5573a3c..0000000000
--- a/glib2/patches/patch-gio_glocalfileinfo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gio_glocalfileinfo.c,v 1.3 2018/05/21 08:39:38 jperkin Exp $
-
-Re-enable gdesktopappinfo on Darwin.
-
---- gio/glocalfileinfo.c.orig 2018-01-08 21:34:19.000000000 +0000
-+++ gio/glocalfileinfo.c
-@@ -1290,7 +1290,7 @@ get_content_type (const char *b
-
- content_type = g_content_type_guess (basename, NULL, 0, &result_uncertain);
-
--#if !defined(G_OS_WIN32) && !defined(HAVE_COCOA)
-+#if !defined(G_OS_WIN32)
- if (!fast && result_uncertain && path != NULL)
- {
- guchar sniff_buffer[4096];
diff --git a/glib2/patches/patch-gio_gresource-tool.c b/glib2/patches/patch-gio_gresource-tool.c
deleted file mode 100644
index 7f7d34e218..0000000000
--- a/glib2/patches/patch-gio_gresource-tool.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-gio_gresource-tool.c,v 1.2 2019/06/03 09:53:50 prlw1 Exp $
-
-Solaris fix
-
---- gio/gresource-tool.c.orig 2019-05-03 13:43:28.000000000 +0000
-+++ gio/gresource-tool.c
-@@ -29,6 +29,11 @@
- #include <locale.h>
-
- #ifdef HAVE_LIBELF
-+/* Solaris native libelf does not support largefile in 32-bit mode */
-+# if defined(__sun) && defined(__i386)
-+# undef _FILE_OFFSET_BITS
-+# define _FILE_OFFSET_BITS 32
-+# endif
- #include <libelf.h>
- #include <gelf.h>
- #endif
diff --git a/glib2/patches/patch-gio_gunixcredentialsmessage.c b/glib2/patches/patch-gio_gunixcredentialsmessage.c
deleted file mode 100644
index 99b1dc5345..0000000000
--- a/glib2/patches/patch-gio_gunixcredentialsmessage.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-gio_gunixcredentialsmessage.c,v 1.3 2018/10/19 16:44:15 leot Exp $
-
-Remove unused NetBSD case (G_CREDENTIALS_TYPE_NETBSD_UNPCBID does
-not support that, LOCAL_CREDS should be probably be used instead.
-Please not that before NetBSD 8.0 LOCAL_CREDS did not have an sc_pid
-field making it probably not suitable as GCredentials mechanism).
-
---- gio/gunixcredentialsmessage.c.orig 2017-07-13 23:03:39.000000000 +0000
-+++ gio/gunixcredentialsmessage.c
-@@ -89,8 +89,6 @@ g_unix_credentials_message_get_msg_type
- return SCM_CREDENTIALS;
- #elif G_CREDENTIALS_USE_FREEBSD_CMSGCRED
- return SCM_CREDS;
--#elif G_CREDENTIALS_USE_NETBSD_UNPCBID
-- return SCM_CREDS;
- #elif G_CREDENTIALS_USE_SOLARIS_UCRED
- return SCM_UCRED;
- #elif G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED
diff --git a/glib2/patches/patch-gio_gunixmounts.c b/glib2/patches/patch-gio_gunixmounts.c
deleted file mode 100644
index f43037d68c..0000000000
--- a/glib2/patches/patch-gio_gunixmounts.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gio_gunixmounts.c,v 1.5 2019/06/06 11:05:12 adam Exp $
-
-SunOS has sys/mntent.h but no mnt_opts.
-XXX who else uses the sys/mntent.h case?
-https://gitlab.gnome.org/GNOME/glib/merge_requests/890
-
---- gio/gunixmounts.c.orig 2019-05-03 13:43:28.000000000 +0000
-+++ gio/gunixmounts.c
-@@ -736,7 +736,7 @@ _g_get_unix_mounts (void)
- mntent.mnt_mountp,
- NULL,
- mntent.mnt_fstype,
-- mntent.mnt_opts,
-+ mntent.mnt_mntopts,
- is_read_only);
-
- return_list = g_list_prepend (return_list, mount_entry);
diff --git a/glib2/patches/patch-gio_inotify_inotify-kernel.c b/glib2/patches/patch-gio_inotify_inotify-kernel.c
deleted file mode 100644
index b5857131b9..0000000000
--- a/glib2/patches/patch-gio_inotify_inotify-kernel.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-gio_inotify_inotify-kernel.c,v 1.5 2019/11/14 11:40:30 wiz Exp $
-
-Use _XOPEN_NAME_MAX in lieu of NAME_MAX for SunOS.
-
-Include <sys/filio.h> for FIONREAD on SunOS.
-https://gitlab.gnome.org/GNOME/glib/merge_requests/889
-
---- gio/inotify/inotify-kernel.c.orig 2019-10-04 11:44:23.000000000 +0000
-+++ gio/inotify/inotify-kernel.c
-@@ -33,11 +33,17 @@
- #ifdef HAVE_SYS_FILIO_H
- #include <sys/filio.h>
- #endif
-+#ifdef HAVE_SYS_FILIO_H
-+#include <sys/filio.h>
-+#endif
- #include <glib/glib-unix.h>
-
- #include "glib-private.h"
-
- /* From inotify(7) */
-+#if !defined(NAME_MAX) && defined(_XOPEN_NAME_MAX)
-+#define NAME_MAX _XOPEN_NAME_MAX
-+#endif
- #define MAX_EVENT_SIZE (sizeof(struct inotify_event) + NAME_MAX + 1)
-
- /* Amount of time to sleep on receipt of uninteresting events */
diff --git a/glib2/patches/patch-gio_meson.build b/glib2/patches/patch-gio_meson.build
deleted file mode 100644
index e3887055f7..0000000000
--- a/glib2/patches/patch-gio_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gio_meson.build,v 1.7 2019/11/14 11:40:30 wiz Exp $
-
-Disable inotify on SunOS.
-
---- gio/meson.build.orig 2019-10-04 11:44:23.000000000 +0000
-+++ gio/meson.build
-@@ -760,7 +760,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()]
diff --git a/glib2/patches/patch-gio_tests_gdbus-export.c b/glib2/patches/patch-gio_tests_gdbus-export.c
deleted file mode 100644
index 7d5d1099fd..0000000000
--- a/glib2/patches/patch-gio_tests_gdbus-export.c
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-gio_tests_gdbus-export.c,v 1.1 2019/06/21 20:21:00 prlw1 Exp $
-
-Revert GHashTable improvements
-https://gitlab.gnome.org/GNOME/glib/merge_requests/208
-
-to fix PR pkg/54310
-
---- gio/tests/gdbus-export.c.orig 2019-06-10 17:47:20.000000000 +0000
-+++ gio/tests/gdbus-export.c
-@@ -337,22 +337,6 @@ introspect_callback (GDBusProxy *proxy
- g_main_loop_quit (loop);
- }
-
--static gint
--compare_strings (gconstpointer a,
-- gconstpointer b)
--{
-- const gchar *sa = *(const gchar **) a;
-- const gchar *sb = *(const gchar **) b;
--
-- /* Array terminator must sort last */
-- if (sa == NULL)
-- return 1;
-- if (sb == NULL)
-- return -1;
--
-- return strcmp (sa, sb);
--}
--
- static gchar **
- get_nodes_at (GDBusConnection *c,
- const gchar *object_path)
-@@ -406,9 +390,6 @@ get_nodes_at (GDBusConnection *c,
- g_free (xml_data);
- g_dbus_node_info_unref (node_info);
-
-- /* Nodes are semantically unordered; sort array so tests can rely on order */
-- g_ptr_array_sort (p, compare_strings);
--
- return (gchar **) g_ptr_array_free (p, FALSE);
- }
-
-@@ -1259,9 +1240,9 @@ test_object_registration (void)
- nodes = get_nodes_at (c, "/foo/dyna");
- g_assert (nodes != NULL);
- g_assert_cmpint (g_strv_length (nodes), ==, 3);
-- g_assert_cmpstr (nodes[0], ==, "cat");
-- g_assert_cmpstr (nodes[1], ==, "cheezburger");
-- g_assert_cmpstr (nodes[2], ==, "lol");
-+ g_assert_cmpstr (nodes[0], ==, "lol");
-+ g_assert_cmpstr (nodes[1], ==, "cat");
-+ g_assert_cmpstr (nodes[2], ==, "cheezburger");
- g_strfreev (nodes);
- g_assert_cmpint (count_interfaces (c, "/foo/dyna/lol"), ==, 4);
- g_assert_cmpint (count_interfaces (c, "/foo/dyna/cat"), ==, 4);
-@@ -1272,10 +1253,10 @@ test_object_registration (void)
- nodes = get_nodes_at (c, "/foo/dyna");
- g_assert (nodes != NULL);
- g_assert_cmpint (g_strv_length (nodes), ==, 4);
-- g_assert_cmpstr (nodes[0], ==, "cat");
-- g_assert_cmpstr (nodes[1], ==, "cheezburger");
-- g_assert_cmpstr (nodes[2], ==, "dynamicallycreated");
-- g_assert_cmpstr (nodes[3], ==, "lol");
-+ g_assert_cmpstr (nodes[0], ==, "lol");
-+ g_assert_cmpstr (nodes[1], ==, "cat");
-+ g_assert_cmpstr (nodes[2], ==, "cheezburger");
-+ g_assert_cmpstr (nodes[3], ==, "dynamicallycreated");
- g_strfreev (nodes);
- g_assert_cmpint (count_interfaces (c, "/foo/dyna/dynamicallycreated"), ==, 4);
-
diff --git a/glib2/patches/patch-gio_tests_meson.build b/glib2/patches/patch-gio_tests_meson.build
deleted file mode 100644
index d01a2d80c2..0000000000
--- a/glib2/patches/patch-gio_tests_meson.build
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-gio_tests_meson.build,v 1.4 2020/03/10 17:30:00 minskim Exp $
-
-Darwin: Set LD_LIBRARY_PATH to run uninstalled executable with @rpath.
-
---- gio/tests/meson.build.orig 2019-12-19 16:33:15.000000000 +0000
-+++ gio/tests/meson.build
-@@ -470,7 +470,9 @@ if not meson.is_cross_build() or meson.h
- plugin_resources_c = custom_target('plugin-resources.c',
- input : 'test4.gresource.xml',
- output : 'plugin-resources.c',
-- command : [glib_compile_resources,
-+ command : [env_program.path(),
-+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
-+ glib_compile_resources,
- '--target=@OUTPUT@',
- '--sourcedir=' + meson.current_source_dir(),
- '--generate-source',
-@@ -494,7 +496,9 @@ if not meson.is_cross_build() or meson.h
- test_gresource = custom_target('test.gresource',
- input : 'test.gresource.xml',
- output : 'test.gresource',
-- command : [glib_compile_resources,
-+ command : [env_program.path(),
-+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
-+ glib_compile_resources,
- '--target=@OUTPUT@',
- '--sourcedir=' + meson.current_source_dir(),
- '--sourcedir=' + meson.current_build_dir(),
-@@ -505,7 +509,9 @@ if not meson.is_cross_build() or meson.h
- test_resources2_c = custom_target('test_resources2.c',
- input : 'test3.gresource.xml',
- output : 'test_resources2.c',
-- command : [glib_compile_resources,
-+ command : [env_program.path(),
-+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
-+ glib_compile_resources,
- '--target=@OUTPUT@',
- '--sourcedir=' + meson.current_source_dir(),
- '--generate',
-@@ -516,7 +522,9 @@ if not meson.is_cross_build() or meson.h
- test_resources2_h = custom_target('test_resources2.h',
- input : 'test3.gresource.xml',
- output : 'test_resources2.h',
-- command : [glib_compile_resources,
-+ command : [env_program.path(),
-+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
-+ glib_compile_resources,
- '--target=@OUTPUT@',
- '--sourcedir=' + meson.current_source_dir(),
- '--generate',
-@@ -528,7 +536,9 @@ if not meson.is_cross_build() or meson.h
- input : 'test2.gresource.xml',
- depends : big_test_resource,
- output : 'test_resources.c',
-- command : [glib_compile_resources,
-+ command : [env_program.path(),
-+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
-+ glib_compile_resources,
- '--target=@OUTPUT@',
- '--sourcedir=' + meson.current_source_dir(),
- '--sourcedir=' + meson.current_build_dir(),
-@@ -539,7 +549,9 @@ if not meson.is_cross_build() or meson.h
- digit_test_resources_c = custom_target('digit_test_resources.c',
- input : '111_digit_test.gresource.xml',
- output : 'digit_test_resources.c',
-- command : [glib_compile_resources,
-+ command : [env_program.path(),
-+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
-+ glib_compile_resources,
- '--target=@OUTPUT@',
- '--sourcedir=' + meson.current_source_dir(),
- '--sourcedir=' + meson.current_build_dir(),
-@@ -550,7 +562,9 @@ if not meson.is_cross_build() or meson.h
- digit_test_resources_h = custom_target('digit_test_resources.h',
- input : '111_digit_test.gresource.xml',
- output : 'digit_test_resources.h',
-- command : [glib_compile_resources,
-+ command : [env_program.path(),
-+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
-+ glib_compile_resources,
- '--target=@OUTPUT@',
- '--sourcedir=' + meson.current_source_dir(),
- '--generate',
diff --git a/glib2/patches/patch-glib_gatomic.c b/glib2/patches/patch-glib_gatomic.c
deleted file mode 100644
index c2585a84f0..0000000000
--- a/glib2/patches/patch-glib_gatomic.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-glib_gatomic.c,v 1.2 2020/03/04 15:11:48 wiz Exp $
-
-Ignore __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 as is already done
-for android and linux. PR pkg/54298
-
---- glib/gatomic.c.orig 2020-02-27 16:12:52.000000000 +0000
-+++ glib/gatomic.c
-@@ -94,8 +94,6 @@
- * implement the atomic operations in a lock-free manner.
- */
-
--#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
--
- /**
- * g_atomic_int_get:
- * @atomic: a pointer to a #gint or #guint
-@@ -658,14 +656,6 @@ gsize
- return InterlockedXor (atomic, val);
- #endif
- }
--#else
--
--/* This error occurs when `meson configure` decided that we should be capable
-- * of lock-free atomics but we find at compile-time that we are not.
-- */
--#error G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics.
--
--#endif /* defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */
-
- #else /* G_ATOMIC_LOCK_FREE */
-
diff --git a/glib2/patches/patch-glib_gatomic.h b/glib2/patches/patch-glib_gatomic.h
deleted file mode 100644
index f7f7b3507d..0000000000
--- a/glib2/patches/patch-glib_gatomic.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-glib_gatomic.h,v 1.2 2020/03/04 15:11:48 wiz Exp $
-
-Ignore __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 as is already done
-for android and linux. PR pkg/54298
-
---- glib/gatomic.h.orig 2020-02-27 16:12:52.000000000 +0000
-+++ glib/gatomic.h
-@@ -82,7 +82,7 @@ gint g_atomic_int_exc
-
- G_END_DECLS
-
--#if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
-+#if defined(G_ATOMIC_LOCK_FREE)
-
- /* We prefer the new C11-style atomic extension of GCC if available */
- #if defined(__ATOMIC_SEQ_CST)
-@@ -372,7 +372,7 @@ G_END_DECLS
-
- #endif /* !defined(__ATOMIC_SEQ_CST) */
-
--#else /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */
-+#else /* defined(G_ATOMIC_LOCK_FREE) */
-
- #define g_atomic_int_get(atomic) \
- (g_atomic_int_get ((gint *) (atomic)))
diff --git a/glib2/patches/patch-glib_genviron.c b/glib2/patches/patch-glib_genviron.c
deleted file mode 100644
index ff26525214..0000000000
--- a/glib2/patches/patch-glib_genviron.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-glib_genviron.c,v 1.2 2020/03/04 15:11:48 wiz Exp $
-
-Avoid the build failure with Clang on FreeBSD (see PR 54752).
-Set environ as a weak symbol (thanks to Joerg).
-
---- glib/genviron.c.orig 2020-02-27 16:12:52.000000000 +0000
-+++ glib/genviron.c
-@@ -329,8 +329,12 @@ g_setenv (const gchar *variable,
- /* According to the Single Unix Specification, environ is not
- * in any system header, although unistd.h often declares it.
- */
-+#if defined(__FreeBSD__)
-+extern __attribute__((__weak__)) char **environ;
-+#else
- extern char **environ;
- #endif
-+#endif
-
- /**
- * g_unsetenv:
diff --git a/glib2/patches/patch-glib_gspawn.c b/glib2/patches/patch-glib_gspawn.c
deleted file mode 100644
index 69636285fd..0000000000
--- a/glib2/patches/patch-glib_gspawn.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-glib_gspawn.c,v 1.2 2020/03/04 15:11:48 wiz Exp $
-
-Avoid the build failure with Clang on FreeBSD (see PR 54752).
-Set environ as a weak symbol (thanks to Joerg).
-
---- glib/gspawn.c.orig 2020-02-27 16:12:52.000000000 +0000
-+++ glib/gspawn.c
-@@ -85,8 +85,12 @@
- #ifdef HAVE__NSGETENVIRON
- #define environ (*_NSGetEnviron())
- #else
-+#if defined(__FreeBSD__)
-+extern __attribute__((__weak__)) char **environ;
-+#else
- extern char **environ;
- #endif
-+#endif
-
- #ifndef O_CLOEXEC
- #define O_CLOEXEC 0
diff --git a/glib2/patches/patch-glib_gthread-posix.c b/glib2/patches/patch-glib_gthread-posix.c
deleted file mode 100644
index ca948280cb..0000000000
--- a/glib2/patches/patch-glib_gthread-posix.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-glib_gthread-posix.c,v 1.2 2014/09/14 23:35:23 prlw1 Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=736651
-
---- glib/gthread-posix.c.orig 2014-02-22 15:29:07.000000000 +0000
-+++ glib/gthread-posix.c
-@@ -644,6 +644,7 @@ g_cond_impl_new (void)
- #elif defined (HAVE_PTHREAD_CONDATTR_SETCLOCK) && defined (CLOCK_MONOTONIC)
- if G_UNLIKELY ((status = pthread_condattr_setclock (&attr, CLOCK_MONOTONIC)) != 0)
- g_thread_abort (status, "pthread_condattr_setclock");
-+#elif defined (CLOCK_MONOTONIC)
- #else
- #error Cannot support GCond on your platform.
- #endif
-@@ -892,6 +893,21 @@ g_cond_wait_until (GCond *cond,
- if ((status = pthread_cond_timedwait (g_cond_get_impl (cond), g_mutex_get_impl (mutex), &ts)) == 0)
- return TRUE;
- }
-+#elif defined (CLOCK_MONOTONIC)
-+ {
-+ gint64 monotonic_now = g_get_monotonic_time ();
-+ gint64 real_end_time;
-+
-+ if (end_time <= monotonic_now)
-+ return FALSE;
-+
-+ real_end_time = g_get_real_time () + (end_time - monotonic_now);
-+
-+ ts.tv_sec = real_end_time / 1000000;
-+ ts.tv_nsec = (real_end_time % 1000000) * 1000;
-+ if ((status = pthread_cond_timedwait (g_cond_get_impl (cond), g_mutex_get_impl (mutex), &ts)) == 0)
-+ return TRUE;
-+ }
- #else
- #error Cannot support GCond on your platform.
- #endif
diff --git a/glib2/patches/patch-glib_meson.build b/glib2/patches/patch-glib_meson.build
deleted file mode 100644
index 41f3f809bb..0000000000
--- a/glib2/patches/patch-glib_meson.build
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-glib_meson.build,v 1.9 2020/09/29 10:43:33 prlw1 Exp $
-
-- Don't bother with gtester as it's slated for deprecation anyway:
- https://gitlab.gnome.org/GNOME/glib/issues/1441
-
---- glib/meson.build.orig 2020-02-27 16:12:52.000000000 +0000
-+++ glib/meson.build
-@@ -410,25 +410,8 @@ if host_system == 'windows'
- include_directories : configinc,
- dependencies : [libglib_dep])
- endif
--else
-- gtester = executable('gtester', 'gtester.c',
-- install : true,
-- c_args : ['-UG_DISABLE_ASSERT'],
-- include_directories : configinc,
-- dependencies : [libglib_dep])
- endif
-
--report_conf = configuration_data()
--report_conf.set('GLIB_VERSION', glib_version)
--report_conf.set('PYTHON', python_name)
--configure_file(
-- input: 'gtester-report.in',
-- output: 'gtester-report',
-- install_dir: get_option('bindir'),
-- configuration: report_conf,
-- install_mode: 'rwxr-xr-x'
--)
--
- install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
-
- gdb_conf = configuration_data()
diff --git a/glib2/patches/patch-glib_tests_hash.c b/glib2/patches/patch-glib_tests_hash.c
deleted file mode 100644
index 800d81eea3..0000000000
--- a/glib2/patches/patch-glib_tests_hash.c
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-glib_tests_hash.c,v 1.3 2020/03/04 15:11:48 wiz Exp $
-
-Revert GHashTable improvements
-https://gitlab.gnome.org/GNOME/glib/merge_requests/208
-
-to fix PR pkg/54310
-
---- glib/tests/hash.c.orig 2020-02-27 16:12:52.000000000 +0000
-+++ glib/tests/hash.c
-@@ -1353,9 +1353,6 @@ struct _GHashTable
- gint nnodes;
- gint noccupied; /* nnodes + tombstones */
-
-- guint have_big_keys : 1;
-- guint have_big_values : 1;
--
- gpointer *keys;
- guint *hashes;
- gpointer *values;
-@@ -1390,23 +1387,6 @@ count_keys (GHashTable *h, gint *unused,
- }
- }
-
--#define BIG_ENTRY_SIZE (SIZEOF_VOID_P)
--#define SMALL_ENTRY_SIZE (SIZEOF_INT)
--
--#if SMALL_ENTRY_SIZE < BIG_ENTRY_SIZE
--# define USE_SMALL_ARRAYS
--#endif
--
--static gpointer
--fetch_key_or_value (gpointer a, guint index, gboolean is_big)
--{
--#ifdef USE_SMALL_ARRAYS
-- return is_big ? *(((gpointer *) a) + index) : GUINT_TO_POINTER (*(((guint *) a) + index));
--#else
-- return *(((gpointer *) a) + index);
--#endif
--}
--
- static void
- check_data (GHashTable *h)
- {
-@@ -1414,9 +1394,14 @@ check_data (GHashTable *h)
-
- for (i = 0; i < h->size; i++)
- {
-- if (h->hashes[i] >= 2)
-+ if (h->hashes[i] < 2)
-+ {
-+ g_assert (h->keys[i] == NULL);
-+ g_assert (h->values[i] == NULL);
-+ }
-+ else
- {
-- g_assert_cmpint (h->hashes[i], ==, h->hash_func (fetch_key_or_value (h->keys, i, h->have_big_keys)));
-+ g_assert_cmpint (h->hashes[i], ==, h->hash_func (h->keys[i]));
- }
- }
- }
diff --git a/glib2/patches/patch-glib_tests_include.c b/glib2/patches/patch-glib_tests_include.c
deleted file mode 100644
index 9861ed9c08..0000000000
--- a/glib2/patches/patch-glib_tests_include.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-glib_tests_include.c,v 1.3 2019/11/26 10:27:09 jperkin Exp $
-
-Fix SunOS build.
-
---- glib/tests/include.c.orig 2019-10-21 17:18:40.000000000 +0000
-+++ glib/tests/include.c
-@@ -1,8 +1,10 @@
- /* Test case for bug 659866 */
-
-+#ifndef __sun
- #define _POSIX_C_SOURCE 199309L
- #undef _GNU_SOURCE
- #undef _XOPEN_SOURCE
-+#endif
- #include <pthread.h>
- #include <glib.h>
-
diff --git a/glib2/patches/patch-glib_tests_meson.build b/glib2/patches/patch-glib_tests_meson.build
deleted file mode 100644
index 252ffc8709..0000000000
--- a/glib2/patches/patch-glib_tests_meson.build
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-glib_tests_meson.build,v 1.1 2019/11/14 12:26:26 ryoon Exp $
-
-* Fix gtester is not defined error during configure.
-
---- glib/tests/meson.build.orig 2021-03-18 13:28:31.953625200 +0000
-+++ glib/tests/meson.build
-@@ -269,21 +269,4 @@ executable('testing-helper', 'testing-he
- install: installed_tests_enabled,
- )
-
--# some testing of gtester functionality
--if not meson.is_cross_build() and host_system != 'windows'
-- xmllint = find_program('xmllint', required: false)
-- if xmllint.found()
-- tmpsample_xml = custom_target('tmpsample.xml',
-- output : 'tmpsample.xml',
-- command : [ gtester, '-k', '--quiet', '--i-know-this-is-deprecated', '-o', '@OUTPUT@',
-- '--test-arg=--gtester-selftest', gtester])
--
-- test('gtester-xmllint-check', xmllint,
-- args : ['--noout', tmpsample_xml],
-- env : test_env,
-- suite : ['glib'],
-- )
-- endif
--endif
--
- subdir('path-test-subdir')
diff --git a/glib2/patches/patch-gobject_glib-genmarshal.in b/glib2/patches/patch-gobject_glib-genmarshal.in
deleted file mode 100644
index bb689af617..0000000000
--- a/glib2/patches/patch-gobject_glib-genmarshal.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gobject_glib-genmarshal.in,v 1.1 2017/10/15 08:23:06 prlw1 Exp $
-
-Revert 4395a897 Use env to run the Python-based tools
-https://bugzilla.gnome.org/show_bug.cgi?id=788527
-
---- gobject/glib-genmarshal.in.orig 2017-09-04 12:42:30.000000000 +0000
-+++ gobject/glib-genmarshal.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
-+#!@PYTHON@
-
- # pylint: disable=too-many-lines, missing-docstring, invalid-name
-
diff --git a/glib2/patches/patch-gobject_glib-mkenums.in b/glib2/patches/patch-gobject_glib-mkenums.in
deleted file mode 100644
index 376056c7bb..0000000000
--- a/glib2/patches/patch-gobject_glib-mkenums.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-gobject_glib-mkenums.in,v 1.5 2019/06/03 09:53:50 prlw1 Exp $
-
-- Do not print failing characters that might not be ASCII
-
---- gobject/glib-mkenums.in.orig 2018-01-08 20:00:49.000000000 +0000
-+++ gobject/glib-mkenums.in
-@@ -88,9 +88,8 @@ else:
- # https://bugzilla.gnome.org/show_bug.cgi?id=785113#c20
- def replace_and_warn(err):
- # 7 characters of context either side of the offending character
-- print_warning('UnicodeWarning: {} at {} ({})'.format(
-- err.reason, err.start,
-- err.object[err.start - 7:err.end + 7]))
-+ print_warning('UnicodeWarning: {} at {}'.format(
-+ err.reason, err.start))
- return ('?', err.end)
-
- codecs.register_error('replace_and_warn', replace_and_warn)
diff --git a/glib2/patches/patch-gobject_meson.build b/glib2/patches/patch-gobject_meson.build
deleted file mode 100644
index 17acef177b..0000000000
--- a/glib2/patches/patch-gobject_meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gobject_meson.build,v 1.5 2019/11/14 11:40:30 wiz Exp $
-
-Leave glib-genmarshal and glib-mkenums to devel/glib2-tools.
-
---- gobject/meson.build.orig 2019-10-04 11:44:24.000000000 +0000
-+++ gobject/meson.build
-@@ -75,6 +75,7 @@ foreach tool: python_tools
- input : tool + '.in',
- output : tool,
- configuration : python_tools_conf,
-+ install : false,
- install_dir : glib_bindir,
- )
-
diff --git a/glib2/patches/patch-meson.build b/glib2/patches/patch-meson.build
deleted file mode 100644
index 6353e8f93e..0000000000
--- a/glib2/patches/patch-meson.build
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- meson.build.orig 2021-03-18 13:28:31.970625400 +0000
-+++ meson.build
-@@ -2220,9 +2220,11 @@ endif
-
- glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
-
--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.5'
diff --git a/glib2/patches/patch-meson_options.txt b/glib2/patches/patch-meson_options.txt
deleted file mode 100644
index 536a54799a..0000000000
--- a/glib2/patches/patch-meson_options.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-meson_options.txt,v 1.2 2019/11/14 11:40:30 wiz Exp $
-
-Add use_cocoa option.
-
---- meson_options.txt.orig 2019-10-04 11:44:24.000000000 +0000
-+++ meson_options.txt
-@@ -90,6 +90,11 @@ option('nls',
- yield: true,
- description : 'Enable native language support (translations)')
-
-+option('use_cocoa',
-+ type : 'boolean',
-+ value : false,
-+ description : 'Use Cocoa on macOS')
-+
- option('oss_fuzz',
- type : 'feature',
- value : 'disabled',
diff --git a/glib2/schemas.mk b/glib2/schemas.mk
deleted file mode 100644
index 086eede74c..0000000000
--- a/glib2/schemas.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: schemas.mk,v 1.3 2019/11/03 10:39:12 rillig Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# GSettings schemas. It takes care of rebuilding the corresponding databases
-# at (de)installation time.
-#
-
-.if !defined(GLIB_SCHEMAS_MK)
-GLIB_SCHEMAS_MK= # defined
-
-GLIB_COMPILE_SCHEMAS= ${BUILDLINK_PREFIX.glib2}/bin/glib-compile-schemas
-
-FILES_SUBST+= GLIB_SCHEMAS_DIR=${GLIB_SCHEMAS_DIR:Q}
-FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${GLIB_COMPILE_SCHEMAS:Q}
-GLIB_SCHEMAS_DIR= ${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas
-INSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl
-DEINSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl
-
-TOOLS_NOOP+= glib-compile-schemas
-# Adding glib-compile-schemas to TOOLS_NOOP is not enough to mock out all
-# calls to this tool. Some packages do 'pkg-config --variable
-# glib_compile_schemas gio-2.0' to get the path to the binary. Do a best
-# effort here by overriding the possibly-defined GLIB_COMPILE_SCHEMAS
-# variable in the offending Makefiles.
-MAKE_FLAGS+= GLIB_COMPILE_SCHEMAS=glib-compile-schemas
-
-.include "../../devel/glib2/buildlink3.mk"
-
-.endif # GLIB_SCHEMAS_MK
diff --git a/gnome-desktop40/Makefile b/gnome-desktop40/Makefile
index 79a4565940..eb9548515a 100644
--- a/gnome-desktop40/Makefile
+++ b/gnome-desktop40/Makefile
@@ -25,7 +25,7 @@ MESON_ARGS+= -Dgtk_doc=false
MESON_ARGS+= -Ddebug_tools=false
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.44.0
-.include "../../wip/glib2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.36.5
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
diff --git a/gnome-shell/Makefile b/gnome-shell/Makefile
index e83202bfc9..3054708dcd 100644
--- a/gnome-shell/Makefile
+++ b/gnome-shell/Makefile
@@ -16,6 +16,7 @@ MESON_ARGS+= -Dnetworkmanager=false
MESON_ARGS+= -Dsystemd=false
MESON_ARGS+= -Dextensions_app=false
MESON_ARGS+= -Dextensions_tool=false
+MESON_ARGS+= -Dman=true
TOOL_DEPENDS+= sassc>=3.6:../../www/sassc
TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
diff --git a/mutter/Makefile b/mutter/Makefile
index 12f43f6451..e5f72a8f6b 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -66,7 +66,7 @@ REQD_FILES+= ${EGDIR}/X11/xinit/xinitrc.d/90-mutter \
${PKG_SYSCONFBASE}/X11/xinit/xinitrc.d/90-mutter
.include "../../devel/meson/build.mk"
-.include "../../wip/glib2/schemas.mk"
+.include "../../devel/glib2/schemas.mk"
.include "../../audio/libcanberra/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../graphics/graphene/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index