pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update to glib-2.58.2 (incomplete!)
Module Name: pkgsrc-wip
Committed By: Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By: bsiegert
Date: Sun Jan 20 17:36:01 2019 +0000
Changeset: 8c74f5cdad5862140739b89ab467e4d3a7381797
Modified Files:
glib2/Makefile
glib2/Makefile.common
glib2/PLIST
glib2/distinfo
glib2/patches/patch-gio_gresource-tool.c
Removed Files:
glib2/patches/patch-Makefile.in
glib2/patches/patch-aa
glib2/patches/patch-af
glib2/patches/patch-ak
glib2/patches/patch-an
glib2/patches/patch-cd
glib2/patches/patch-cl
glib2/patches/patch-cm
glib2/patches/patch-glib_gtimezone.c
glib2/patches/patch-gobject_Makefile.am
glib2/patches/patch-gobject_Makefile.in
Log Message:
Update to glib-2.58.2 (incomplete!)
This uses meson and ninja for building. While 2.58 still builds with
autotools (as the less recommended alternative), 2.60 will require this,
so let's get started.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8c74f5cdad5862140739b89ab467e4d3a7381797
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
glib2/Makefile | 2 +
glib2/Makefile.common | 17 +-
glib2/PLIST | 974 ++++++++++---------------------
glib2/distinfo | 13 +-
glib2/patches/patch-Makefile.in | 16 -
glib2/patches/patch-aa | 182 ------
glib2/patches/patch-af | 23 -
glib2/patches/patch-ak | 80 ---
glib2/patches/patch-an | 188 ------
glib2/patches/patch-cd | 41 --
glib2/patches/patch-cl | 74 ---
glib2/patches/patch-cm | 32 -
glib2/patches/patch-gio_gresource-tool.c | 8 +-
glib2/patches/patch-glib_gtimezone.c | 21 -
glib2/patches/patch-gobject_Makefile.am | 14 -
glib2/patches/patch-gobject_Makefile.in | 14 -
16 files changed, 305 insertions(+), 1394 deletions(-)
diffs:
diff --git a/glib2/Makefile b/glib2/Makefile
index 602184c990..8b2c732a52 100644
--- a/glib2/Makefile
+++ b/glib2/Makefile
@@ -60,6 +60,8 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
PYTHON_FOR_BUILD_ONLY?= yes
.include "../../lang/python/pyversion.mk"
+.include "../../devel/py-meson/build.mk"
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
diff --git a/glib2/Makefile.common b/glib2/Makefile.common
index cc3e9ecd3a..a25feaa64e 100644
--- a/glib2/Makefile.common
+++ b/glib2/Makefile.common
@@ -24,21 +24,8 @@ USE_LANGUAGES= c c++ c99
USE_LIBTOOL= yes
TEST_TARGET= check
-DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
-PATCHDIR= ${.CURDIR}/../../devel/glib2/patches
-
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
-CONFIGURE_ARGS+= --disable-fam # See sysutils/gio-fam.
-CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-CONFIGURE_ARGS+= --with-pcre=system
-CONFIGURE_ARGS+= --disable-dtrace
-CONFIGURE_ARGS+= --disable-man # Requires xsltproc and Docbook.
-# Avoid unnecessary autotools invocation.
-CONFIGURE_ARGS+= --disable-maintainer-mode
-# Avoid linux dependency on libmount-dev
-CONFIGURE_ARGS.Linux+= --disable-libmount
+#DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
+#PATCHDIR= ${.CURDIR}/../../devel/glib2/patches
# When ICONV_TYPE=gnu ensure we explicitly use the GNU version, to avoid
# conflicts between iconv.h from converters/libiconv and builtin libiconv
diff --git a/glib2/PLIST b/glib2/PLIST
index f990e56988..d5e33fdad6 100644
--- a/glib2/PLIST
+++ b/glib2/PLIST
@@ -1,284 +1,301 @@
-@comment $NetBSD: PLIST,v 1.101 2018/08/19 18:32:27 wiz Exp $
+@comment $NetBSD$
bin/gapplication
bin/gdbus
+bin/gdbus-codegen
bin/gio
+bin/gio-launch-desktop
bin/gio-querymodules
bin/glib-compile-resources
bin/glib-compile-schemas
+bin/glib-genmarshal
bin/glib-gettextize
+bin/glib-mkenums
bin/gobject-query
bin/gresource
bin/gsettings
bin/gtester
bin/gtester-report
-include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
-include/glib/gio-unix-2.0/gio/gfiledescriptorbased.h
-include/glib/gio-unix-2.0/gio/gunixconnection.h
-include/glib/gio-unix-2.0/gio/gunixcredentialsmessage.h
-include/glib/gio-unix-2.0/gio/gunixfdlist.h
-include/glib/gio-unix-2.0/gio/gunixfdmessage.h
-include/glib/gio-unix-2.0/gio/gunixinputstream.h
-include/glib/gio-unix-2.0/gio/gunixmounts.h
-include/glib/gio-unix-2.0/gio/gunixoutputstream.h
-include/glib/gio-unix-2.0/gio/gunixsocketaddress.h
-include/glib/glib-2.0/gio/gaction.h
-include/glib/glib-2.0/gio/gactiongroup.h
-include/glib/glib-2.0/gio/gactiongroupexporter.h
-include/glib/glib-2.0/gio/gactionmap.h
-include/glib/glib-2.0/gio/gappinfo.h
-include/glib/glib-2.0/gio/gapplication.h
-include/glib/glib-2.0/gio/gapplicationcommandline.h
-include/glib/glib-2.0/gio/gasyncinitable.h
-include/glib/glib-2.0/gio/gasyncresult.h
-include/glib/glib-2.0/gio/gbufferedinputstream.h
-include/glib/glib-2.0/gio/gbufferedoutputstream.h
-include/glib/glib-2.0/gio/gbytesicon.h
-include/glib/glib-2.0/gio/gcancellable.h
-include/glib/glib-2.0/gio/gcharsetconverter.h
-include/glib/glib-2.0/gio/gcontenttype.h
-include/glib/glib-2.0/gio/gconverter.h
-include/glib/glib-2.0/gio/gconverterinputstream.h
-include/glib/glib-2.0/gio/gconverteroutputstream.h
-include/glib/glib-2.0/gio/gcredentials.h
-include/glib/glib-2.0/gio/gdatagrambased.h
-include/glib/glib-2.0/gio/gdatainputstream.h
-include/glib/glib-2.0/gio/gdataoutputstream.h
-include/glib/glib-2.0/gio/gdbusactiongroup.h
-include/glib/glib-2.0/gio/gdbusaddress.h
-include/glib/glib-2.0/gio/gdbusauthobserver.h
-include/glib/glib-2.0/gio/gdbusconnection.h
-include/glib/glib-2.0/gio/gdbuserror.h
-include/glib/glib-2.0/gio/gdbusinterface.h
-include/glib/glib-2.0/gio/gdbusinterfaceskeleton.h
-include/glib/glib-2.0/gio/gdbusintrospection.h
-include/glib/glib-2.0/gio/gdbusmenumodel.h
-include/glib/glib-2.0/gio/gdbusmessage.h
-include/glib/glib-2.0/gio/gdbusmethodinvocation.h
-include/glib/glib-2.0/gio/gdbusnameowning.h
-include/glib/glib-2.0/gio/gdbusnamewatching.h
-include/glib/glib-2.0/gio/gdbusobject.h
-include/glib/glib-2.0/gio/gdbusobjectmanager.h
-include/glib/glib-2.0/gio/gdbusobjectmanagerclient.h
-include/glib/glib-2.0/gio/gdbusobjectmanagerserver.h
-include/glib/glib-2.0/gio/gdbusobjectproxy.h
-include/glib/glib-2.0/gio/gdbusobjectskeleton.h
-include/glib/glib-2.0/gio/gdbusproxy.h
-include/glib/glib-2.0/gio/gdbusserver.h
-include/glib/glib-2.0/gio/gdbusutils.h
-include/glib/glib-2.0/gio/gdrive.h
-include/glib/glib-2.0/gio/gdtlsclientconnection.h
-include/glib/glib-2.0/gio/gdtlsconnection.h
-include/glib/glib-2.0/gio/gdtlsserverconnection.h
-include/glib/glib-2.0/gio/gemblem.h
-include/glib/glib-2.0/gio/gemblemedicon.h
-include/glib/glib-2.0/gio/gfile.h
-include/glib/glib-2.0/gio/gfileattribute.h
-include/glib/glib-2.0/gio/gfileenumerator.h
-include/glib/glib-2.0/gio/gfileicon.h
-include/glib/glib-2.0/gio/gfileinfo.h
-include/glib/glib-2.0/gio/gfileinputstream.h
-include/glib/glib-2.0/gio/gfileiostream.h
-include/glib/glib-2.0/gio/gfilemonitor.h
-include/glib/glib-2.0/gio/gfilenamecompleter.h
-include/glib/glib-2.0/gio/gfileoutputstream.h
-include/glib/glib-2.0/gio/gfilterinputstream.h
-include/glib/glib-2.0/gio/gfilteroutputstream.h
-include/glib/glib-2.0/gio/gicon.h
-include/glib/glib-2.0/gio/ginetaddress.h
-include/glib/glib-2.0/gio/ginetaddressmask.h
-include/glib/glib-2.0/gio/ginetsocketaddress.h
-include/glib/glib-2.0/gio/ginitable.h
-include/glib/glib-2.0/gio/ginputstream.h
-include/glib/glib-2.0/gio/gio-autocleanups.h
-include/glib/glib-2.0/gio/gio.h
-include/glib/glib-2.0/gio/gioenums.h
-include/glib/glib-2.0/gio/gioenumtypes.h
-include/glib/glib-2.0/gio/gioerror.h
-include/glib/glib-2.0/gio/giomodule.h
-include/glib/glib-2.0/gio/gioscheduler.h
-include/glib/glib-2.0/gio/giostream.h
-include/glib/glib-2.0/gio/giotypes.h
-include/glib/glib-2.0/gio/glistmodel.h
-include/glib/glib-2.0/gio/gliststore.h
-include/glib/glib-2.0/gio/gloadableicon.h
-include/glib/glib-2.0/gio/gmemoryinputstream.h
-include/glib/glib-2.0/gio/gmemoryoutputstream.h
-include/glib/glib-2.0/gio/gmenu.h
-include/glib/glib-2.0/gio/gmenuexporter.h
-include/glib/glib-2.0/gio/gmenumodel.h
-include/glib/glib-2.0/gio/gmount.h
-include/glib/glib-2.0/gio/gmountoperation.h
-include/glib/glib-2.0/gio/gnativevolumemonitor.h
-include/glib/glib-2.0/gio/gnetworkaddress.h
-include/glib/glib-2.0/gio/gnetworking.h
-include/glib/glib-2.0/gio/gnetworkmonitor.h
-include/glib/glib-2.0/gio/gnetworkservice.h
-include/glib/glib-2.0/gio/gnotification.h
-include/glib/glib-2.0/gio/goutputstream.h
-include/glib/glib-2.0/gio/gpermission.h
-include/glib/glib-2.0/gio/gpollableinputstream.h
-include/glib/glib-2.0/gio/gpollableoutputstream.h
-include/glib/glib-2.0/gio/gpollableutils.h
-include/glib/glib-2.0/gio/gpropertyaction.h
-include/glib/glib-2.0/gio/gproxy.h
-include/glib/glib-2.0/gio/gproxyaddress.h
-include/glib/glib-2.0/gio/gproxyaddressenumerator.h
-include/glib/glib-2.0/gio/gproxyresolver.h
-include/glib/glib-2.0/gio/gremoteactiongroup.h
-include/glib/glib-2.0/gio/gresolver.h
-include/glib/glib-2.0/gio/gresource.h
-include/glib/glib-2.0/gio/gseekable.h
-include/glib/glib-2.0/gio/gsettings.h
-include/glib/glib-2.0/gio/gsettingsbackend.h
-include/glib/glib-2.0/gio/gsettingsschema.h
-include/glib/glib-2.0/gio/gsimpleaction.h
-include/glib/glib-2.0/gio/gsimpleactiongroup.h
-include/glib/glib-2.0/gio/gsimpleasyncresult.h
-include/glib/glib-2.0/gio/gsimpleiostream.h
-include/glib/glib-2.0/gio/gsimplepermission.h
-include/glib/glib-2.0/gio/gsimpleproxyresolver.h
-include/glib/glib-2.0/gio/gsocket.h
-include/glib/glib-2.0/gio/gsocketaddress.h
-include/glib/glib-2.0/gio/gsocketaddressenumerator.h
-include/glib/glib-2.0/gio/gsocketclient.h
-include/glib/glib-2.0/gio/gsocketconnectable.h
-include/glib/glib-2.0/gio/gsocketconnection.h
-include/glib/glib-2.0/gio/gsocketcontrolmessage.h
-include/glib/glib-2.0/gio/gsocketlistener.h
-include/glib/glib-2.0/gio/gsocketservice.h
-include/glib/glib-2.0/gio/gsrvtarget.h
-include/glib/glib-2.0/gio/gsubprocess.h
-include/glib/glib-2.0/gio/gsubprocesslauncher.h
-include/glib/glib-2.0/gio/gtask.h
-include/glib/glib-2.0/gio/gtcpconnection.h
-include/glib/glib-2.0/gio/gtcpwrapperconnection.h
-include/glib/glib-2.0/gio/gtestdbus.h
-include/glib/glib-2.0/gio/gthemedicon.h
-include/glib/glib-2.0/gio/gthreadedsocketservice.h
-include/glib/glib-2.0/gio/gtlsbackend.h
-include/glib/glib-2.0/gio/gtlscertificate.h
-include/glib/glib-2.0/gio/gtlsclientconnection.h
-include/glib/glib-2.0/gio/gtlsconnection.h
-include/glib/glib-2.0/gio/gtlsdatabase.h
-include/glib/glib-2.0/gio/gtlsfiledatabase.h
-include/glib/glib-2.0/gio/gtlsinteraction.h
-include/glib/glib-2.0/gio/gtlspassword.h
-include/glib/glib-2.0/gio/gtlsserverconnection.h
-include/glib/glib-2.0/gio/gvfs.h
-include/glib/glib-2.0/gio/gvolume.h
-include/glib/glib-2.0/gio/gvolumemonitor.h
-include/glib/glib-2.0/gio/gzlibcompressor.h
-include/glib/glib-2.0/gio/gzlibdecompressor.h
-include/glib/glib-2.0/glib-object.h
-include/glib/glib-2.0/glib-unix.h
-include/glib/glib-2.0/glib.h
-include/glib/glib-2.0/glib/deprecated/gallocator.h
-include/glib/glib-2.0/glib/deprecated/gcache.h
-include/glib/glib-2.0/glib/deprecated/gcompletion.h
-include/glib/glib-2.0/glib/deprecated/gmain.h
-include/glib/glib-2.0/glib/deprecated/grel.h
-include/glib/glib-2.0/glib/deprecated/gthread.h
-include/glib/glib-2.0/glib/galloca.h
-include/glib/glib-2.0/glib/garray.h
-include/glib/glib-2.0/glib/gasyncqueue.h
-include/glib/glib-2.0/glib/gatomic.h
-include/glib/glib-2.0/glib/gbacktrace.h
-include/glib/glib-2.0/glib/gbase64.h
-include/glib/glib-2.0/glib/gbitlock.h
-include/glib/glib-2.0/glib/gbookmarkfile.h
-include/glib/glib-2.0/glib/gbytes.h
-include/glib/glib-2.0/glib/gcharset.h
-include/glib/glib-2.0/glib/gchecksum.h
-include/glib/glib-2.0/glib/gconvert.h
-include/glib/glib-2.0/glib/gdataset.h
-include/glib/glib-2.0/glib/gdate.h
-include/glib/glib-2.0/glib/gdatetime.h
-include/glib/glib-2.0/glib/gdir.h
-include/glib/glib-2.0/glib/genviron.h
-include/glib/glib-2.0/glib/gerror.h
-include/glib/glib-2.0/glib/gfileutils.h
-include/glib/glib-2.0/glib/ggettext.h
-include/glib/glib-2.0/glib/ghash.h
-include/glib/glib-2.0/glib/ghmac.h
-include/glib/glib-2.0/glib/ghook.h
-include/glib/glib-2.0/glib/ghostutils.h
-include/glib/glib-2.0/glib/gi18n-lib.h
-include/glib/glib-2.0/glib/gi18n.h
-include/glib/glib-2.0/glib/giochannel.h
-include/glib/glib-2.0/glib/gkeyfile.h
-include/glib/glib-2.0/glib/glib-autocleanups.h
-include/glib/glib-2.0/glib/glist.h
-include/glib/glib-2.0/glib/gmacros.h
-include/glib/glib-2.0/glib/gmain.h
-include/glib/glib-2.0/glib/gmappedfile.h
-include/glib/glib-2.0/glib/gmarkup.h
-include/glib/glib-2.0/glib/gmem.h
-include/glib/glib-2.0/glib/gmessages.h
-include/glib/glib-2.0/glib/gnode.h
-include/glib/glib-2.0/glib/goption.h
-include/glib/glib-2.0/glib/gpattern.h
-include/glib/glib-2.0/glib/gpoll.h
-include/glib/glib-2.0/glib/gprimes.h
-include/glib/glib-2.0/glib/gprintf.h
-include/glib/glib-2.0/glib/gqsort.h
-include/glib/glib-2.0/glib/gquark.h
-include/glib/glib-2.0/glib/gqueue.h
-include/glib/glib-2.0/glib/grand.h
-include/glib/glib-2.0/glib/gregex.h
-include/glib/glib-2.0/glib/gscanner.h
-include/glib/glib-2.0/glib/gsequence.h
-include/glib/glib-2.0/glib/gshell.h
-include/glib/glib-2.0/glib/gslice.h
-include/glib/glib-2.0/glib/gslist.h
-include/glib/glib-2.0/glib/gspawn.h
-include/glib/glib-2.0/glib/gstdio.h
-include/glib/glib-2.0/glib/gstrfuncs.h
-include/glib/glib-2.0/glib/gstring.h
-include/glib/glib-2.0/glib/gstringchunk.h
-include/glib/glib-2.0/glib/gtestutils.h
-include/glib/glib-2.0/glib/gthread.h
-include/glib/glib-2.0/glib/gthreadpool.h
-include/glib/glib-2.0/glib/gtimer.h
-include/glib/glib-2.0/glib/gtimezone.h
-include/glib/glib-2.0/glib/gtrashstack.h
-include/glib/glib-2.0/glib/gtree.h
-include/glib/glib-2.0/glib/gtypes.h
-include/glib/glib-2.0/glib/gunicode.h
-include/glib/glib-2.0/glib/gurifuncs.h
-include/glib/glib-2.0/glib/gutils.h
-include/glib/glib-2.0/glib/guuid.h
-include/glib/glib-2.0/glib/gvariant.h
-include/glib/glib-2.0/glib/gvarianttype.h
-include/glib/glib-2.0/glib/gversion.h
-include/glib/glib-2.0/glib/gversionmacros.h
-include/glib/glib-2.0/glib/gwin32.h
-include/glib/glib-2.0/gmodule.h
-include/glib/glib-2.0/gobject/gbinding.h
-include/glib/glib-2.0/gobject/gboxed.h
-include/glib/glib-2.0/gobject/gclosure.h
-include/glib/glib-2.0/gobject/genums.h
-include/glib/glib-2.0/gobject/glib-types.h
-include/glib/glib-2.0/gobject/gmarshal.h
-include/glib/glib-2.0/gobject/gobject-autocleanups.h
-include/glib/glib-2.0/gobject/gobject.h
-include/glib/glib-2.0/gobject/gobjectnotifyqueue.c
-include/glib/glib-2.0/gobject/gparam.h
-include/glib/glib-2.0/gobject/gparamspecs.h
-include/glib/glib-2.0/gobject/gsignal.h
-include/glib/glib-2.0/gobject/gsourceclosure.h
-include/glib/glib-2.0/gobject/gtype.h
-include/glib/glib-2.0/gobject/gtypemodule.h
-include/glib/glib-2.0/gobject/gtypeplugin.h
-include/glib/glib-2.0/gobject/gvalue.h
-include/glib/glib-2.0/gobject/gvaluearray.h
-include/glib/glib-2.0/gobject/gvaluecollector.h
-include/glib/glib-2.0/gobject/gvaluetypes.h
+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/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
+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/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/gurifuncs.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-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.la
-lib/libglib-2.0.la
-lib/libgmodule-2.0.la
-lib/libgobject-2.0.la
-lib/libgthread-2.0.la
+lib/libgio-2.0.so
+lib/libgio-2.0.so.0
+lib/libgio-2.0.so.0.5800.2
+lib/libglib-2.0.so
+lib/libglib-2.0.so.0
+lib/libglib-2.0.so.0.5800.2
+lib/libgmodule-2.0.so
+lib/libgmodule-2.0.so.0
+lib/libgmodule-2.0.so.0.5800.2
+lib/libgobject-2.0.so
+lib/libgobject-2.0.so.0
+lib/libgobject-2.0.so.0.5800.2
+lib/libgthread-2.0.so
+lib/libgthread-2.0.so.0
+lib/libgthread-2.0.so.0.5800.2
lib/pkgconfig/gio-2.0.pc
lib/pkgconfig/gio-unix-2.0.pc
lib/pkgconfig/glib-2.0.pc
@@ -292,425 +309,26 @@ 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${LOCALBASE}/lib/libglib-2.0.so.0.5600.2-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5600.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5800.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5800.2-gdb.py
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
+share/glib-2.0/codegen/__init__.py
+share/glib-2.0/codegen/codegen.py
+share/glib-2.0/codegen/codegen_docbook.py
+share/glib-2.0/codegen/codegen_main.py
+share/glib-2.0/codegen/config.py
+share/glib-2.0/codegen/dbustypes.py
+share/glib-2.0/codegen/parser.py
+share/glib-2.0/codegen/utils.py
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/gtk-doc/html/gio/GAction.html
-share/gtk-doc/html/gio/GActionGroup.html
-share/gtk-doc/html/gio/GActionMap.html
-share/gtk-doc/html/gio/GAppInfo.html
-share/gtk-doc/html/gio/GAppInfoMonitor.html
-share/gtk-doc/html/gio/GApplication.html
-share/gtk-doc/html/gio/GApplicationCommandLine.html
-share/gtk-doc/html/gio/GAsyncInitable.html
-share/gtk-doc/html/gio/GAsyncResult.html
-share/gtk-doc/html/gio/GBufferedInputStream.html
-share/gtk-doc/html/gio/GBufferedOutputStream.html
-share/gtk-doc/html/gio/GBytesIcon.html
-share/gtk-doc/html/gio/GCancellable.html
-share/gtk-doc/html/gio/GCharsetConverter.html
-share/gtk-doc/html/gio/GConverter.html
-share/gtk-doc/html/gio/GCredentials.html
-share/gtk-doc/html/gio/GDBusActionGroup.html
-share/gtk-doc/html/gio/GDBusAuthObserver.html
-share/gtk-doc/html/gio/GDBusConnection.html
-share/gtk-doc/html/gio/GDBusInterface.html
-share/gtk-doc/html/gio/GDBusInterfaceSkeleton.html
-share/gtk-doc/html/gio/GDBusMenuModel.html
-share/gtk-doc/html/gio/GDBusMessage.html
-share/gtk-doc/html/gio/GDBusMethodInvocation.html
-share/gtk-doc/html/gio/GDBusObject.html
-share/gtk-doc/html/gio/GDBusObjectManager.html
-share/gtk-doc/html/gio/GDBusObjectManagerClient.html
-share/gtk-doc/html/gio/GDBusObjectManagerServer.html
-share/gtk-doc/html/gio/GDBusObjectProxy.html
-share/gtk-doc/html/gio/GDBusObjectSkeleton.html
-share/gtk-doc/html/gio/GDBusProxy.html
-share/gtk-doc/html/gio/GDBusServer.html
-share/gtk-doc/html/gio/GDataInputStream.html
-share/gtk-doc/html/gio/GDataOutputStream.html
-share/gtk-doc/html/gio/GDatagramBased.html
-share/gtk-doc/html/gio/GDrive.html
-share/gtk-doc/html/gio/GDtlsClientConnection.html
-share/gtk-doc/html/gio/GDtlsConnection.html
-share/gtk-doc/html/gio/GDtlsServerConnection.html
-share/gtk-doc/html/gio/GEmblem.html
-share/gtk-doc/html/gio/GEmblemedIcon.html
-share/gtk-doc/html/gio/GFile.html
-share/gtk-doc/html/gio/GFileDescriptorBased.html
-share/gtk-doc/html/gio/GFileEnumerator.html
-share/gtk-doc/html/gio/GFileIOStream.html
-share/gtk-doc/html/gio/GFileIcon.html
-share/gtk-doc/html/gio/GFileInfo.html
-share/gtk-doc/html/gio/GFileInputStream.html
-share/gtk-doc/html/gio/GFileMonitor.html
-share/gtk-doc/html/gio/GFileOutputStream.html
-share/gtk-doc/html/gio/GFilenameCompleter.html
-share/gtk-doc/html/gio/GFilterInputStream.html
-share/gtk-doc/html/gio/GFilterOutputStream.html
-share/gtk-doc/html/gio/GIOModule.html
-share/gtk-doc/html/gio/GIOStream.html
-share/gtk-doc/html/gio/GIcon.html
-share/gtk-doc/html/gio/GInetAddress.html
-share/gtk-doc/html/gio/GInetAddressMask.html
-share/gtk-doc/html/gio/GInetSocketAddress.html
-share/gtk-doc/html/gio/GInitable.html
-share/gtk-doc/html/gio/GInputStream.html
-share/gtk-doc/html/gio/GListModel.html
-share/gtk-doc/html/gio/GListStore.html
-share/gtk-doc/html/gio/GLoadableIcon.html
-share/gtk-doc/html/gio/GMemoryInputStream.html
-share/gtk-doc/html/gio/GMemoryOutputStream.html
-share/gtk-doc/html/gio/GMenu.html
-share/gtk-doc/html/gio/GMenuModel.html
-share/gtk-doc/html/gio/GMount.html
-share/gtk-doc/html/gio/GMountOperation.html
-share/gtk-doc/html/gio/GNetworkAddress.html
-share/gtk-doc/html/gio/GNetworkMonitor.html
-share/gtk-doc/html/gio/GNetworkService.html
-share/gtk-doc/html/gio/GNotification.html
-share/gtk-doc/html/gio/GOutputStream.html
-share/gtk-doc/html/gio/GPermission.html
-share/gtk-doc/html/gio/GPollableInputStream.html
-share/gtk-doc/html/gio/GPollableOutputStream.html
-share/gtk-doc/html/gio/GPropertyAction.html
-share/gtk-doc/html/gio/GProxy.html
-share/gtk-doc/html/gio/GProxyAddress.html
-share/gtk-doc/html/gio/GProxyAddressEnumerator.html
-share/gtk-doc/html/gio/GProxyResolver.html
-share/gtk-doc/html/gio/GRemoteActionGroup.html
-share/gtk-doc/html/gio/GResolver.html
-share/gtk-doc/html/gio/GResource.html
-share/gtk-doc/html/gio/GSeekable.html
-share/gtk-doc/html/gio/GSettings.html
-share/gtk-doc/html/gio/GSettingsBackend.html
-share/gtk-doc/html/gio/GSimpleAction.html
-share/gtk-doc/html/gio/GSimpleActionGroup.html
-share/gtk-doc/html/gio/GSimpleAsyncResult.html
-share/gtk-doc/html/gio/GSimpleIOStream.html
-share/gtk-doc/html/gio/GSimplePermission.html
-share/gtk-doc/html/gio/GSimpleProxyResolver.html
-share/gtk-doc/html/gio/GSocket.html
-share/gtk-doc/html/gio/GSocketAddress.html
-share/gtk-doc/html/gio/GSocketAddressEnumerator.html
-share/gtk-doc/html/gio/GSocketClient.html
-share/gtk-doc/html/gio/GSocketConnectable.html
-share/gtk-doc/html/gio/GSocketConnection.html
-share/gtk-doc/html/gio/GSocketControlMessage.html
-share/gtk-doc/html/gio/GSocketListener.html
-share/gtk-doc/html/gio/GSocketService.html
-share/gtk-doc/html/gio/GSrvTarget.html
-share/gtk-doc/html/gio/GSubprocess.html
-share/gtk-doc/html/gio/GSubprocessLauncher.html
-share/gtk-doc/html/gio/GTask.html
-share/gtk-doc/html/gio/GTcpConnection.html
-share/gtk-doc/html/gio/GTcpWrapperConnection.html
-share/gtk-doc/html/gio/GTestDBus.html
-share/gtk-doc/html/gio/GThemedIcon.html
-share/gtk-doc/html/gio/GThreadedSocketService.html
-share/gtk-doc/html/gio/GTlsBackend.html
-share/gtk-doc/html/gio/GTlsCertificate.html
-share/gtk-doc/html/gio/GTlsClientConnection.html
-share/gtk-doc/html/gio/GTlsConnection.html
-share/gtk-doc/html/gio/GTlsDatabase.html
-share/gtk-doc/html/gio/GTlsFileDatabase.html
-share/gtk-doc/html/gio/GTlsInteraction.html
-share/gtk-doc/html/gio/GTlsPassword.html
-share/gtk-doc/html/gio/GTlsServerConnection.html
-share/gtk-doc/html/gio/GUnixConnection.html
-share/gtk-doc/html/gio/GUnixCredentialsMessage.html
-share/gtk-doc/html/gio/GUnixFDList.html
-share/gtk-doc/html/gio/GUnixFDMessage.html
-share/gtk-doc/html/gio/GUnixInputStream.html
-share/gtk-doc/html/gio/GUnixOutputStream.html
-share/gtk-doc/html/gio/GUnixSocketAddress.html
-share/gtk-doc/html/gio/GVfs.html
-share/gtk-doc/html/gio/GVolume.html
-share/gtk-doc/html/gio/GVolumeMonitor.html
-share/gtk-doc/html/gio/GZlibCompressor.html
-share/gtk-doc/html/gio/GZlibDecompressor.html
-share/gtk-doc/html/gio/annotation-glossary.html
-share/gtk-doc/html/gio/api-index-full.html
-share/gtk-doc/html/gio/application.html
-share/gtk-doc/html/gio/async.html
-share/gtk-doc/html/gio/ch01.html
-share/gtk-doc/html/gio/ch02.html
-share/gtk-doc/html/gio/ch03.html
-share/gtk-doc/html/gio/ch32.html
-share/gtk-doc/html/gio/ch33.html
-share/gtk-doc/html/gio/ch33s02.html
-share/gtk-doc/html/gio/ch33s03.html
-share/gtk-doc/html/gio/ch34.html
-share/gtk-doc/html/gio/ch34s02.html
-share/gtk-doc/html/gio/ch34s03.html
-share/gtk-doc/html/gio/ch34s04.html
-share/gtk-doc/html/gio/ch34s05.html
-share/gtk-doc/html/gio/ch34s06.html
-share/gtk-doc/html/gio/ch34s07.html
-share/gtk-doc/html/gio/ch35.html
-share/gtk-doc/html/gio/ch35s02.html
-share/gtk-doc/html/gio/ch35s03.html
-share/gtk-doc/html/gio/ch35s04.html
-share/gtk-doc/html/gio/conversion.html
-share/gtk-doc/html/gio/data-models.html
-share/gtk-doc/html/gio/extending-gio.html
-share/gtk-doc/html/gio/extending.html
-share/gtk-doc/html/gio/failable_initialization.html
-share/gtk-doc/html/gio/file_mon.html
-share/gtk-doc/html/gio/file_ops.html
-share/gtk-doc/html/gio/gapplication-tool.html
-share/gtk-doc/html/gio/gdbus-codegen.html
-share/gtk-doc/html/gio/gdbus-convenience.html
-share/gtk-doc/html/gio/gdbus-example-gdbus-codegen.html
-share/gtk-doc/html/gio/gdbus-lowlevel.html
-share/gtk-doc/html/gio/gdbus.html
-share/gtk-doc/html/gio/gio-D-Bus-Addresses.html
-share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html
-share/gtk-doc/html/gio/gio-D-Bus-Utilities.html
-share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
-share/gtk-doc/html/gio/gio-Extension-Points.html
-share/gtk-doc/html/gio/gio-GActionGroup-exporter.html
-share/gtk-doc/html/gio/gio-GContentType.html
-share/gtk-doc/html/gio/gio-GConverterInputstream.html
-share/gtk-doc/html/gio/gio-GConverterOutputstream.html
-share/gtk-doc/html/gio/gio-GDBusError.html
-share/gtk-doc/html/gio/gio-GFileAttribute.html
-share/gtk-doc/html/gio/gio-GIOError.html
-share/gtk-doc/html/gio/gio-GIOScheduler.html
-share/gtk-doc/html/gio/gio-GMenuModel-exporter.html
-share/gtk-doc/html/gio/gio-GSettingsSchema-GSettingsSchemaSource.html
-share/gtk-doc/html/gio/gio-GWin32InputStream.html
-share/gtk-doc/html/gio/gio-GWin32OutputStream.html
-share/gtk-doc/html/gio/gio-GWin32RegistryKey.html
-share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
-share/gtk-doc/html/gio/gio-TLS-Overview.html
-share/gtk-doc/html/gio/gio-Unix-Mounts.html
-share/gtk-doc/html/gio/gio-Watching-Bus-Names.html
-share/gtk-doc/html/gio/gio-gnetworking.h.html
-share/gtk-doc/html/gio/gio-gpollableutils.html
-share/gtk-doc/html/gio/gio-hierarchy.html
-share/gtk-doc/html/gio/gio-querymodules.html
-share/gtk-doc/html/gio/gio.devhelp2
-share/gtk-doc/html/gio/gio.html
-share/gtk-doc/html/gio/glib-compile-resources.html
-share/gtk-doc/html/gio/glib-compile-schemas.html
-share/gtk-doc/html/gio/gresource-tool.html
-share/gtk-doc/html/gio/gsettings-tool.html
-share/gtk-doc/html/gio/gvfs-overview.png
-share/gtk-doc/html/gio/highlevel-socket.html
-share/gtk-doc/html/gio/home.png
-share/gtk-doc/html/gio/icons.html
-share/gtk-doc/html/gio/index.html
-share/gtk-doc/html/gio/left-insensitive.png
-share/gtk-doc/html/gio/left.png
-share/gtk-doc/html/gio/menu-example.png
-share/gtk-doc/html/gio/menu-model.png
-share/gtk-doc/html/gio/migrating.html
-share/gtk-doc/html/gio/networking.html
-share/gtk-doc/html/gio/permissions.html
-share/gtk-doc/html/gio/pt01.html
-share/gtk-doc/html/gio/pt02.html
-share/gtk-doc/html/gio/registry.html
-share/gtk-doc/html/gio/resolver.html
-share/gtk-doc/html/gio/resources.html
-share/gtk-doc/html/gio/right-insensitive.png
-share/gtk-doc/html/gio/right.png
-share/gtk-doc/html/gio/running-gio-apps.html
-share/gtk-doc/html/gio/settings.html
-share/gtk-doc/html/gio/streaming.html
-share/gtk-doc/html/gio/style.css
-share/gtk-doc/html/gio/subprocesses.html
-share/gtk-doc/html/gio/testing.html
-share/gtk-doc/html/gio/tls.html
-share/gtk-doc/html/gio/tools.html
-share/gtk-doc/html/gio/types.html
-share/gtk-doc/html/gio/up-insensitive.png
-share/gtk-doc/html/gio/up.png
-share/gtk-doc/html/gio/utils.html
-share/gtk-doc/html/gio/volume_mon.html
-share/gtk-doc/html/glib/Sorted_binary_tree_breadth-first_traversal.svg
-share/gtk-doc/html/glib/Sorted_binary_tree_inorder.svg
-share/gtk-doc/html/glib/Sorted_binary_tree_postorder.svg
-share/gtk-doc/html/glib/Sorted_binary_tree_preorder.svg
-share/gtk-doc/html/glib/annotation-glossary.html
-share/gtk-doc/html/glib/api-index-full.html
-share/gtk-doc/html/glib/deprecated.html
-share/gtk-doc/html/glib/file-name-encodings.png
-share/gtk-doc/html/glib/glib-Arrays.html
-share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
-share/gtk-doc/html/glib/glib-Atomic-Operations.html
-share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
-share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
-share/gtk-doc/html/glib/glib-Base64-Encoding.html
-share/gtk-doc/html/glib/glib-Basic-Types.html
-share/gtk-doc/html/glib/glib-Bookmark-file-parser.html
-share/gtk-doc/html/glib/glib-Bounds-checked-integer-arithmetic.html
-share/gtk-doc/html/glib/glib-Byte-Arrays.html
-share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
-share/gtk-doc/html/glib/glib-Caches.html
-share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
-share/gtk-doc/html/glib/glib-Commandline-option-parser.html
-share/gtk-doc/html/glib/glib-Data-Checksums.html
-share/gtk-doc/html/glib/glib-Data-HMACs.html
-share/gtk-doc/html/glib/glib-Datasets.html
-share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
-share/gtk-doc/html/glib/glib-Deprecated-Thread-APIs.html
-share/gtk-doc/html/glib/glib-Double-ended-Queues.html
-share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
-share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
-share/gtk-doc/html/glib/glib-Error-Reporting.html
-share/gtk-doc/html/glib/glib-File-Utilities.html
-share/gtk-doc/html/glib/glib-GDateTime.html
-share/gtk-doc/html/glib/glib-GTimeZone.html
-share/gtk-doc/html/glib/glib-GUuid.html
-share/gtk-doc/html/glib/glib-GVariant.html
-share/gtk-doc/html/glib/glib-GVariantType.html
-share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
-share/gtk-doc/html/glib/glib-Hash-Tables.html
-share/gtk-doc/html/glib/glib-Hook-Functions.html
-share/gtk-doc/html/glib/glib-Hostname-Utilities.html
-share/gtk-doc/html/glib/glib-I18N.html
-share/gtk-doc/html/glib/glib-IO-Channels.html
-share/gtk-doc/html/glib/glib-Key-value-file-parser.html
-share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html
-share/gtk-doc/html/glib/glib-Lexical-Scanner.html
-share/gtk-doc/html/glib/glib-Memory-Allocation.html
-share/gtk-doc/html/glib/glib-Memory-Slices.html
-share/gtk-doc/html/glib/glib-Message-Logging.html
-share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html
-share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html
-share/gtk-doc/html/glib/glib-N-ary-Trees.html
-share/gtk-doc/html/glib/glib-Numerical-Definitions.html
-share/gtk-doc/html/glib/glib-Perl-compatible-regular-expressions.html
-share/gtk-doc/html/glib/glib-Pointer-Arrays.html
-share/gtk-doc/html/glib/glib-Quarks.html
-share/gtk-doc/html/glib/glib-Random-Numbers.html
-share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
-share/gtk-doc/html/glib/glib-Sequences.html
-share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
-share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
-share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
-share/gtk-doc/html/glib/glib-Spawning-Processes.html
-share/gtk-doc/html/glib/glib-Standard-Macros.html
-share/gtk-doc/html/glib/glib-String-Chunks.html
-share/gtk-doc/html/glib/glib-String-Utility-Functions.html
-share/gtk-doc/html/glib/glib-Strings.html
-share/gtk-doc/html/glib/glib-Testing.html
-share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html
-share/gtk-doc/html/glib/glib-Thread-Pools.html
-share/gtk-doc/html/glib/glib-Threads.html
-share/gtk-doc/html/glib/glib-Timers.html
-share/gtk-doc/html/glib/glib-Trash-Stacks.html
-share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
-share/gtk-doc/html/glib/glib-UNIX-specific-utilities-and-integration.html
-share/gtk-doc/html/glib/glib-URI-Functions.html
-share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
-share/gtk-doc/html/glib/glib-Version-Information.html
-share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html
-share/gtk-doc/html/glib/glib-Windows-Compatibility-Functions.html
-share/gtk-doc/html/glib/glib-building.html
-share/gtk-doc/html/glib/glib-changes.html
-share/gtk-doc/html/glib/glib-compiling.html
-share/gtk-doc/html/glib/glib-core.html
-share/gtk-doc/html/glib/glib-cross-compiling.html
-share/gtk-doc/html/glib/glib-data-types.html
-share/gtk-doc/html/glib/glib-fundamentals.html
-share/gtk-doc/html/glib/glib-gettextize.html
-share/gtk-doc/html/glib/glib-programming.html
-share/gtk-doc/html/glib/glib-regex-syntax.html
-share/gtk-doc/html/glib/glib-resources.html
-share/gtk-doc/html/glib/glib-running.html
-share/gtk-doc/html/glib/glib-utilities.html
-share/gtk-doc/html/glib/glib.devhelp2
-share/gtk-doc/html/glib/glib.html
-share/gtk-doc/html/glib/gtester-report.html
-share/gtk-doc/html/glib/gtester.html
-share/gtk-doc/html/glib/gvariant-format-strings.html
-share/gtk-doc/html/glib/gvariant-text.html
-share/gtk-doc/html/glib/home.png
-share/gtk-doc/html/glib/index.html
-share/gtk-doc/html/glib/left-insensitive.png
-share/gtk-doc/html/glib/left.png
-share/gtk-doc/html/glib/mainloop-states.gif
-share/gtk-doc/html/glib/right-insensitive.png
-share/gtk-doc/html/glib/right.png
-share/gtk-doc/html/glib/style.css
-share/gtk-doc/html/glib/tools.html
-share/gtk-doc/html/glib/up-insensitive.png
-share/gtk-doc/html/glib/up.png
-share/gtk-doc/html/gobject/GBinding.html
-share/gtk-doc/html/gobject/GTypeModule.html
-share/gtk-doc/html/gobject/GTypePlugin.html
-share/gtk-doc/html/gobject/annotation-glossary.html
-share/gtk-doc/html/gobject/api-index-full.html
-share/gtk-doc/html/gobject/ch01s02.html
-share/gtk-doc/html/gobject/chapter-gobject.html
-share/gtk-doc/html/gobject/chapter-gtype.html
-share/gtk-doc/html/gobject/chapter-intro.html
-share/gtk-doc/html/gobject/chapter-signal.html
-share/gtk-doc/html/gobject/glib-genmarshal.html
-share/gtk-doc/html/gobject/glib-mkenums.html
-share/gtk-doc/html/gobject/glue.png
-share/gtk-doc/html/gobject/gobject-Boxed-Types.html
-share/gtk-doc/html/gobject/gobject-Closures.html
-share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
-share/gtk-doc/html/gobject/gobject-GParamSpec.html
-share/gtk-doc/html/gobject/gobject-Generic-values.html
-share/gtk-doc/html/gobject/gobject-Signals.html
-share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
-share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html
-share/gtk-doc/html/gobject/gobject-Type-Information.html
-share/gtk-doc/html/gobject/gobject-Value-arrays.html
-share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
-share/gtk-doc/html/gobject/gobject-memory.html
-share/gtk-doc/html/gobject/gobject-properties.html
-share/gtk-doc/html/gobject/gobject-query.html
-share/gtk-doc/html/gobject/gobject.devhelp2
-share/gtk-doc/html/gobject/gtype-conventions.html
-share/gtk-doc/html/gobject/gtype-instantiable-classed.html
-share/gtk-doc/html/gobject/gtype-non-instantiable-classed.html
-share/gtk-doc/html/gobject/gtype-non-instantiable.html
-share/gtk-doc/html/gobject/home.png
-share/gtk-doc/html/gobject/howto-gobject-chainup.html
-share/gtk-doc/html/gobject/howto-gobject-code.html
-share/gtk-doc/html/gobject/howto-gobject-construction.html
-share/gtk-doc/html/gobject/howto-gobject-destruction.html
-share/gtk-doc/html/gobject/howto-gobject-methods.html
-share/gtk-doc/html/gobject/howto-gobject.html
-share/gtk-doc/html/gobject/howto-interface-implement.html
-share/gtk-doc/html/gobject/howto-interface-override.html
-share/gtk-doc/html/gobject/howto-interface-prerequisite.html
-share/gtk-doc/html/gobject/howto-interface-properties.html
-share/gtk-doc/html/gobject/howto-interface.html
-share/gtk-doc/html/gobject/howto-signals.html
-share/gtk-doc/html/gobject/index.html
-share/gtk-doc/html/gobject/left-insensitive.png
-share/gtk-doc/html/gobject/left.png
-share/gtk-doc/html/gobject/pr01.html
-share/gtk-doc/html/gobject/pt01.html
-share/gtk-doc/html/gobject/pt02.html
-share/gtk-doc/html/gobject/pt03.html
-share/gtk-doc/html/gobject/right-insensitive.png
-share/gtk-doc/html/gobject/right.png
-share/gtk-doc/html/gobject/rn01.html
-share/gtk-doc/html/gobject/rn02.html
-share/gtk-doc/html/gobject/signal.html
-share/gtk-doc/html/gobject/style.css
-share/gtk-doc/html/gobject/tools-ginspector.html
-share/gtk-doc/html/gobject/tools-gob.html
-share/gtk-doc/html/gobject/tools-gtkdoc.html
-share/gtk-doc/html/gobject/tools-refdb.html
-share/gtk-doc/html/gobject/tools-vala.html
-share/gtk-doc/html/gobject/up-insensitive.png
-share/gtk-doc/html/gobject/up.png
share/locale/af/LC_MESSAGES/glib20.mo
share/locale/am/LC_MESSAGES/glib20.mo
share/locale/an/LC_MESSAGES/glib20.mo
diff --git a/glib2/distinfo b/glib2/distinfo
index e6b75f2eb1..6f27f9d4b9 100644
--- a/glib2/distinfo
+++ b/glib2/distinfo
@@ -4,35 +4,24 @@ SHA1 (glib-2.58.2.tar.xz) = 9831bbdca749a42526d0afc4b31799e8be22037c
RMD160 (glib-2.58.2.tar.xz) = 29102e684ab62a69cf4aad980f687c47f6356b42
SHA512 (glib-2.58.2.tar.xz) = 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
Size (glib-2.58.2.tar.xz) = 4862612 bytes
-SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
-SHA1 (patch-aa) = 01bdbcb6e49e440eefba966471a986215daec2e9
-SHA1 (patch-af) = f21f5c5f799189885a3826fde8ad079f599ae26b
SHA1 (patch-ah) = d523967c88fc06f46de1d7f2eb04be65db04ada2
SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
-SHA1 (patch-ak) = 040c679220988b31bd9d3e5c80a4fc6c2551e067
SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50
SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = 47986cfa2374ad4a89887bee5896d477a31f651f
SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
-SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
-SHA1 (patch-cl) = 58e5b4a3e8cf0750ceadba30e379954d800f77f7
-SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050
SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa
SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
-SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
+SHA1 (patch-gio_gresource-tool.c) = 43f1133bcf0ce4f3e12f018643b795ed972d5857
SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0
SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
-SHA1 (patch-glib_gtimezone.c) = 3f72bc2ed4447d60871e66984a5e3a80ca8c75f4
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_Makefile.am) = 6eed6b57f5ff0aa0dfb623110b23a3ff78aa4e75
-SHA1 (patch-gobject_Makefile.in) = a4768ff7b0607a8a4dfbb2cff087a987b451fd18
SHA1 (patch-gobject_glib-genmarshal.in) = f21ca416d4eb4ad5a8ce3ffa053f8bcd2be8953a
SHA1 (patch-gobject_glib-mkenums.in) = 651713a9c1fd83aea5060f996b58b35fbe3a43c7
diff --git a/glib2/patches/patch-Makefile.in b/glib2/patches/patch-Makefile.in
deleted file mode 100644
index b838766d24..0000000000
--- a/glib2/patches/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2017/10/13 15:35:10 prlw1 Exp $
-
-tests/gobject requires python to generate testmarshal.h so avoid
-tests directory.
-
---- Makefile.in.orig 2017-10-13 13:38:33.856486834 +0000
-+++ Makefile.in
-@@ -835,7 +835,7 @@ all_test_ltlibs = $(test_ltlibraries) $(
-
- @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
- DIST_SUBDIRS = $(SUBDIRS) build win32
- bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
diff --git a/glib2/patches/patch-aa b/glib2/patches/patch-aa
deleted file mode 100644
index bf8774c61d..0000000000
--- a/glib2/patches/patch-aa
+++ /dev/null
@@ -1,182 +0,0 @@
-$NetBSD: patch-aa,v 1.62 2018/10/08 10:12:06 prlw1 Exp $
-
-- solaris sun studio check and fix
-- use pkgsrc libtool
-
---- configure.orig 2018-04-07 02:37:11.000000000 +0000
-+++ configure
-@@ -5512,6 +5513,9 @@ $as_echo_n "checking for Mac OS X Carbon
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-+#error too old
-+#endif
- #include <Carbon/Carbon.h>
- #include <CoreServices/CoreServices.h>
-
-@@ -5530,6 +5534,9 @@ $as_echo_n "checking for Mac OS X Cocoa
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-+#error too old
-+#endif
- #include <Cocoa/Cocoa.h>
- #ifdef GNUSTEP_BASE_VERSION
- #error "Detected GNUstep, not Cocoa"
-@@ -21597,6 +21604,8 @@ else
- # ifdef _MSC_VER
- # include <malloc.h>
- # define alloca _alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+# include <stdlib.h>
- # else
- # ifdef HAVE_ALLOCA_H
- # include <alloca.h>
-@@ -22524,8 +22533,8 @@ else
- fi
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler" >&5
--$as_echo_n "checking whether using Sun Studio C compiler... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler visibility" >&5
-+$as_echo_n "checking whether using Sun Studio C compiler visibility... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -24521,16 +24530,48 @@ fi
-
- case $host in
- *-*-solaris* )
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler with C99" >&5
-+$as_echo_n "checking whether using Sun Studio C compiler with C99... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
-+#else
-+# include "error: this is STD C99."
-+#endif
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ g_have_sunstudio_c99=yes
-+else
-+ g_have_sunstudio_c99=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $g_have_sunstudio_c99" >&5
-+$as_echo "$g_have_sunstudio_c99" >&6; }
-+ if test $g_have_sunstudio_c99 = yes; then
-+
-+$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
-+
-+ else
-
- $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
-
-
- $as_echo "#define _XOPEN_SOURCE 2" >>confdefs.h
-
-+ fi
-+
-
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-- ;;
-+ ;;
- esac
-
- if test "$ac_cv_func_statfs" = yes; then :
-@@ -25817,9 +25859,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IM
- LIBS="$G_MODULE_LIBS $LIBS"
- LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- echo "void glib_plugin_test(void) { }" > plugin.c
-- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
- ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
-- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
- ${LDFLAGS} -module -o plugin.la -export-dynamic \
- -shrext ".o" -avoid-version plugin.lo \
- -rpath /dont/care >/dev/null 2>&1
-@@ -25989,6 +26081,7 @@ fi
-
-
-
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
- $as_echo_n "checking for gspawn implementation... " >&6; }
- case "$host" in
-@@ -27039,62 +27132,8 @@ if test x"$have_threads" = xposix; then
- G_THREAD_LIBS="-lpthread -lthread"
- ;;
- *)
-- for flag in pthread pthreads mt; do
-- glib_save_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -$flag"
-- if test "$cross_compiling" = yes; then :
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <pthread.h>
--int check_me = 0;
--void* func(void* data) {check_me = 42; return &check_me;}
--int main()
-- { pthread_t t;
-- void *ret;
-- pthread_create (&t, 0, func, 0);
-- pthread_join (t, &ret);
-- return (check_me != 42 || ret != &check_me);
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- glib_flag_works=yes
--else
-- glib_flag_works=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <pthread.h>
--int check_me = 0;
--void* func(void* data) {check_me = 42; return &check_me;}
--int main()
-- { pthread_t t;
-- void *ret;
-- pthread_create (&t, 0, func, 0);
-- pthread_join (t, &ret);
-- return (check_me != 42 || ret != &check_me);
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-- glib_flag_works=yes
--else
-- glib_flag_works=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-- CFLAGS="$glib_save_CFLAGS"
-- if test $glib_flag_works = yes ; then
-- G_THREAD_CFLAGS=-$flag
-- G_THREAD_LIBS=-$flag
-- break;
-- fi
-- done
-+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
- ;;
- esac
-
diff --git a/glib2/patches/patch-af b/glib2/patches/patch-af
deleted file mode 100644
index 459a8f5385..0000000000
--- a/glib2/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.17 2018/04/17 08:03:38 wiz Exp $
-
---- glib/libcharset/Makefile.in.orig 2018-04-07 02:37:16.000000000 +0000
-+++ glib/libcharset/Makefile.in
-@@ -1511,18 +1511,6 @@ check-local: test-nonrecursive
- @ENABLE_INSTALLED_TESTS_TRUE@ echo 'Exec=$(installed_testdir)/$(notdir $<)' >> $@.tmp; \
- @ENABLE_INSTALLED_TESTS_TRUE@ mv $@.tmp $@)
- install-exec-local: all-local
-- $(mkinstalldirs) $(DESTDIR)$(GLIB_CHARSETALIAS_DIR)
-- if test -f $(charset_alias); then \
-- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-- rm -f $(charset_tmp) ; \
-- else \
-- if test @GLIBC21@ = no; then \
-- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-- rm -f $(charset_tmp) ; \
-- fi ; \
-- fi
-
- uninstall-local: all-local
- if test -f $(charset_alias); then \
diff --git a/glib2/patches/patch-ak b/glib2/patches/patch-ak
deleted file mode 100644
index 15f78cc0c4..0000000000
--- a/glib2/patches/patch-ak
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ak,v 1.21 2018/10/08 10:12:06 prlw1 Exp $
-
-- solaris sun studio check and fix
-- use pkgsrc libtool
-
---- configure.ac.orig 2017-06-22 13:15:19.000000000 +0000
-+++ configure.ac
-@@ -687,7 +687,7 @@ int main (void)
- AC_MSG_RESULT($g_have_gnuc_visibility)
- AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
-
--AC_MSG_CHECKING([whether using Sun Studio C compiler])
-+AC_MSG_CHECKING([whether using Sun Studio C compiler visibility])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
- #else
- # include "error: this is not Sun Studio."
-@@ -1040,10 +1040,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
-
- case $host in
- *-*-solaris* )
-- AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-- AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
-- AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-- ;;
-+ AC_MSG_CHECKING([whether using Sun Studio C compiler with C99])
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
-+#else
-+# include "error: this is STD C99."
-+#endif
-+ ]], [[]])], [ g_have_sunstudio_c99=yes ], [ g_have_sunstudio_c99=no ])
-+ AC_MSG_RESULT($g_have_sunstudio_c99)
-+ if test $g_have_sunstudio_c99 = yes; then
-+ AC_DEFINE(_XOPEN_SOURCE, 600, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ else
-+ AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ fi
-+
-+ AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ ;;
- esac
-
- dnl
-@@ -1427,9 +1440,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODUL
- LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
- echo "void glib_plugin_test(void) { }" > plugin.c
-- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
- ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
-- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
- ${LDFLAGS} -module -o plugin.la -export-dynamic \
- -shrext ".o" -avoid-version plugin.lo \
- -rpath /dont/care >/dev/null 2>&1
-@@ -1919,22 +1965,8 @@ AS_IF([ test x"$have_threads" = xposix],
- G_THREAD_LIBS="-lpthread -lthread"
- ;;
- *)
-- for flag in pthread pthreads mt; do
-- glib_save_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -$flag"
-- AC_TRY_RUN(glib_thread_test(0),
-- glib_flag_works=yes,
-- glib_flag_works=no,
-- [AC_LINK_IFELSE([AC_LANG_SOURCE(glib_thread_test(0))],
-- glib_flag_works=yes,
-- glib_flag_works=no)])
-- CFLAGS="$glib_save_CFLAGS"
-- if test $glib_flag_works = yes ; then
-- G_THREAD_CFLAGS=-$flag
-- G_THREAD_LIBS=-$flag
-- break;
-- fi
-- done
-+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
- ;;
- esac
- ])
diff --git a/glib2/patches/patch-an b/glib2/patches/patch-an
deleted file mode 100644
index 26bf7f7233..0000000000
--- a/glib2/patches/patch-an
+++ /dev/null
@@ -1,188 +0,0 @@
-$NetBSD: patch-an,v 1.19 2018/08/19 18:32:27 wiz Exp $
-
-- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
-- Don't compile tests as they include gdbus-codegen tests.
-- Don't install completion data.
-- Re-enable gdesktopappinfo on Darwin.
-
---- gio/Makefile.in.orig 2018-08-17 00:27:41.000000000 +0000
-+++ gio/Makefile.in
-@@ -175,7 +175,7 @@ TESTS = $(am__EXEEXT_2)
- @HAVE_FAM_TRUE@am__append_27 = fam
- @OS_UNIX_TRUE@am__append_28 = xdgmime/libxdgmime.la
- @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h
-+@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h
- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_31 = \
- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \
-@@ -186,8 +186,8 @@ TESTS = $(am__EXEEXT_2)
- @OS_WIN32_TRUE@am__append_32 = gwin32appinfo.c gwin32appinfo.h
- @OS_WIN32_TRUE@am__append_33 = gcontenttype-win32.c
- @OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = gcontenttype.c
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
-+@OS_UNIX_TRUE@am__append_35 = gcontenttype.c
-+@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c
- @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__append_37 = \
- @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@ gcocoanotificationbackend.c
-
-@@ -205,7 +205,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT)
-
- # ------------------------------------------------------------------------
- # gapplication(1) tool
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_46 = gapplication
-+@OS_UNIX_TRUE@am__append_46 = gapplication
- subdir = gio
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
-@@ -231,7 +231,7 @@ mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = gnetworking.h gio.rc
- CONFIG_CLEAN_VPATH_FILES =
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
-+@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
- am__installdirs = "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(installed_testdir)" \
- "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" \
-@@ -535,11 +535,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
- libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
- $(am__objects_4) $(am__objects_1)
- @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo
-+@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo
- am__objects_8 = $(am__objects_6) $(am__objects_7)
- @OS_WIN32_TRUE@am__objects_9 = libgio_2_0_la-gcontenttype-win32.lo
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_10 = \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo
-+@OS_UNIX_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype.lo
- am__objects_11 = $(am__objects_9) $(am__objects_10)
- am__objects_12 = libgio_2_0_la-xdp-dbus.lo
- am__objects_13 = libgio_2_0_la-gnetworkmonitorportal.lo \
-@@ -603,13 +602,10 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l
- $(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
- libgio_objc_2_0_la_LIBADD =
- am__libgio_objc_2_0_la_SOURCES_DIST = gnextstepsettingsbackend.c \
-- gosxcontenttype.c gosxappinfo.c gosxappinfo.h \
- gcocoanotificationbackend.c
- @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__objects_23 = libgio_objc_2_0_la-gcocoanotificationbackend.lo
- @OS_COCOA_TRUE@am_libgio_objc_2_0_la_OBJECTS = \
- @OS_COCOA_TRUE@ libgio_objc_2_0_la-gnextstepsettingsbackend.lo \
--@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxcontenttype.lo \
--@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxappinfo.lo \
- @OS_COCOA_TRUE@ $(am__objects_23)
- libgio_objc_2_0_la_OBJECTS = $(am_libgio_objc_2_0_la_OBJECTS)
- libgio_objc_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-@@ -618,15 +614,15 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A
- $(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
- @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath =
- am__gapplication_SOURCES_DIST = gapplication-tool.c
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS = \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT)
-+@OS_UNIX_TRUE@am_gapplication_OBJECTS = \
-+@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT)
- gapplication_OBJECTS = $(am_gapplication_OBJECTS)
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1)
-+@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \
-+@OS_UNIX_TRUE@ libgio-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
-+@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1)
- am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT)
- gdbus_OBJECTS = $(am_gdbus_OBJECTS)
- gdbus_DEPENDENCIES = libgio-2.0.la \
-@@ -1189,8 +1185,7 @@ am__set_b = \
- *) \
- b='$*';; \
- esac
--DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \
-- fam
-+DIST_SUBDIRS = xdgmime inotify kqueue win32 . fam
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
- $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
- $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \
-@@ -1294,6 +1289,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
- GTKDOC_MKPDF = @GTKDOC_MKPDF@
- GTKDOC_REBASE = @GTKDOC_REBASE@
- G_LIBS_EXTRA = @G_LIBS_EXTRA@
-+G_MODULE_BROKEN_DLOPEN_NULL = @G_MODULE_BROKEN_DLOPEN_NULL@
- G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@
- G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@
- G_MODULE_IMPL = @G_MODULE_IMPL@
-@@ -1571,8 +1567,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
- @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
-
- @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
--SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_18) \
-- $(am__append_21) $(am__append_24) . tests $(am__append_27)
-+SUBDIRS = $(am__append_15) $(am__append_18) $(am__append_21) \
-+ $(am__append_24) . $(am__append_27)
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
- AM_CPPFLAGS = \
-@@ -2036,8 +2032,8 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG
- @OS_COCOA_TRUE@libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
- @OS_COCOA_TRUE@libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
- @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES = \
--@OS_COCOA_TRUE@ gnextstepsettingsbackend.c gosxcontenttype.c \
--@OS_COCOA_TRUE@ gosxappinfo.c gosxappinfo.h $(am__append_37)
-+@OS_COCOA_TRUE@ gnextstepsettingsbackend.c \
-+@OS_COCOA_TRUE@ $(am__append_37)
- EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
- gio_headers = \
- gappinfo.h \
-@@ -2206,12 +2202,12 @@ gdbus_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(NULL)
-
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(NULL)
-+@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
-+@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
-+@OS_UNIX_TRUE@ $(NULL)
-
- completiondir = $(datadir)/bash-completion/completions
- completion_DATA = \
-@@ -2877,8 +2873,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ # am--include-marker
-
-@@ -4459,20 +4453,6 @@ libgio_objc_2_0_la-gnextstepsettingsback
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gnextstepsettingsbackend.lo `test -f 'gnextstepsettingsbackend.c' || echo '$(srcdir)/'`gnextstepsettingsbackend.c
-
--libgio_objc_2_0_la-gosxcontenttype.lo: gosxcontenttype.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxcontenttype.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gosxcontenttype.c' object='libgio_objc_2_0_la-gosxcontenttype.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c
--
--libgio_objc_2_0_la-gosxappinfo.lo: gosxappinfo.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo -c -o libgio_objc_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gosxappinfo.c' object='libgio_objc_2_0_la-gosxappinfo.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c
--
- libgio_objc_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gcocoanotificationbackend.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Tpo -c -o libgio_objc_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo
diff --git a/glib2/patches/patch-cd b/glib2/patches/patch-cd
deleted file mode 100644
index 68ff3d3306..0000000000
--- a/glib2/patches/patch-cd
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-cd,v 1.9 2016/04/07 18:33:05 prlw1 Exp $
-
-sysutils/gio-fam builds the gio/fam backend as a separate module. Force it
-to link against the installed version of glib2, as it is not rebuilt by the
-package.
-
---- gio/fam/Makefile.in.orig 2016-02-16 11:35:28.000000000 +0000
-+++ gio/fam/Makefile.in
-@@ -183,10 +183,7 @@ am__installdirs = "$(DESTDIR)$(giomodule
- LTLIBRARIES = $(giomodule_LTLIBRARIES) $(installed_test_LTLIBRARIES) \
- $(noinst_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la \
-- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
-+libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_libgiofam_la_OBJECTS = libgiofam_la-gfamfilemonitor.lo
- libgiofam_la_OBJECTS = $(am_libgiofam_la_OBJECTS)
- AM_V_lt = $(am__v_lt_@AM_V@)
-@@ -789,9 +786,7 @@ libgiofam_la_CFLAGS = \
-
- libgiofam_la_LDFLAGS = $(module_flags)
- libgiofam_la_LIBADD = \
-- $(top_builddir)/gio/libgio-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la \
-- $(top_builddir)/glib/libglib-2.0.la \
-+ $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
- $(GLIB_LIBS) \
- $(FAM_LIBS) \
- $(NULL)
-@@ -1559,9 +1554,6 @@ check-local: test-nonrecursive
- @ENABLE_INSTALLED_TESTS_TRUE@ mv $@.tmp $@)
-
- install-data-hook:
-- if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \
-- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
-- fi
-
- uninstall-local:
- $(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache
diff --git a/glib2/patches/patch-cl b/glib2/patches/patch-cl
deleted file mode 100644
index ce22b9a6cc..0000000000
--- a/glib2/patches/patch-cl
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-cl,v 1.15 2018/08/19 18:32:27 wiz Exp $
-
-- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
-- Don't compile tests as they include gdbus-codegen tests.
-- Don't install completion data.
-- Re-enable gdesktopappinfo on Darwin.
-
---- gio/Makefile.am.orig 2018-08-17 00:03:20.000000000 +0000
-+++ gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += xdgmime
-@@ -246,7 +246,7 @@ platform_libadd += win32/libgiowin32.la
- platform_deps += win32/libgiowin32.la
- endif
-
--SUBDIRS += . tests
-+SUBDIRS += .
-
- if HAVE_FAM
- SUBDIRS += fam
-@@ -255,9 +255,7 @@ endif
- if OS_UNIX
- platform_libadd += xdgmime/libxdgmime.la
- platform_deps += xdgmime/libxdgmime.la
--if !OS_COCOA
- appinfo_headers += gdesktopappinfo.h
--endif
-
-
- unix_sources = \
-@@ -396,11 +394,9 @@ portal_sources = \
- $(NULL)
-
- if OS_UNIX
--if !OS_COCOA
- contenttype_sources += gcontenttype.c
- appinfo_sources += gdesktopappinfo.c
- endif
--endif
-
- gio_base_sources = \
- gappinfo.c \
-@@ -610,9 +606,6 @@ libgio_objc_2_0_la_CPPFLAGS = $(libgio_2
- libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
- libgio_objc_2_0_la_SOURCES = \
- gnextstepsettingsbackend.c \
-- gosxcontenttype.c \
-- gosxappinfo.c \
-- gosxappinfo.h
- if MAC_OS_X_9
- libgio_objc_2_0_la_SOURCES += \
- gcocoanotificationbackend.c
-@@ -893,7 +886,6 @@ gdbus_LDADD = libgio-2.0.la \
- $(NULL)
-
- if OS_UNIX
--if !OS_COCOA
- # ------------------------------------------------------------------------
- # gapplication(1) tool
- bin_PROGRAMS += gapplication
-@@ -904,7 +896,6 @@ gapplication_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(NULL)
- endif
--endif
-
- completiondir = $(datadir)/bash-completion/completions
- completion_DATA = \
diff --git a/glib2/patches/patch-cm b/glib2/patches/patch-cm
deleted file mode 100644
index f813946030..0000000000
--- a/glib2/patches/patch-cm
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-cm,v 1.3 2013/12/08 13:08:59 prlw1 Exp $
-
-sysutils/gio-fam builds the gio/fam backend as a separate module. Force it
-to link against the installed version of glib2, as it is not rebuilt by the
-package.
-(patch-cd)
---- gio/fam/Makefile.am.orig 2012-03-11 23:55:40.000000000 +0000
-+++ gio/fam/Makefile.am
-@@ -25,11 +25,9 @@ libgiofam_la_CFLAGS = \
- -DGIO_COMPILATION \
- -DG_DISABLE_DEPRECATED
-
--libgiofam_la_LDFLAGS = $(module_flags)
-+libgiofam_la_LDFLAGS = $(module_flags) \
-+ $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0)
- libgiofam_la_LIBADD = \
-- $(top_builddir)/gio/libgio-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la \
-- $(top_builddir)/glib/libglib-2.0.la \
- $(GLIB_LIBS) \
- $(FAM_LIBS) \
- $(NULL)
-@@ -41,9 +39,6 @@ RUN_QUERY_MODULES=true
- endif
-
- install-data-hook:
-- if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \
-- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
-- fi
-
- uninstall-local:
- $(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache
diff --git a/glib2/patches/patch-gio_gresource-tool.c b/glib2/patches/patch-gio_gresource-tool.c
index 79ef4e0220..f934a337af 100644
--- a/glib2/patches/patch-gio_gresource-tool.c
+++ b/glib2/patches/patch-gio_gresource-tool.c
@@ -1,8 +1,8 @@
$NetBSD: patch-gio_gresource-tool.c,v 1.1 2012/07/12 14:43:26 jperkin Exp $
---- gio/gresource-tool.c.orig Thu Jul 12 09:13:01 2012
-+++ gio/gresource-tool.c Thu Jul 12 09:13:06 2012
-@@ -31,6 +31,11 @@
+--- gio/gresource-tool.c.orig 2018-12-18 14:51:13.000000000 +0000
++++ gio/gresource-tool.c
+@@ -29,6 +29,11 @@
#include <locale.h>
#ifdef HAVE_LIBELF
@@ -13,4 +13,4 @@ $NetBSD: patch-gio_gresource-tool.c,v 1.1 2012/07/12 14:43:26 jperkin Exp $
+# endif
#include <libelf.h>
#include <gelf.h>
- #include <sys/mman.h>
+ #endif
diff --git a/glib2/patches/patch-glib_gtimezone.c b/glib2/patches/patch-glib_gtimezone.c
deleted file mode 100644
index 110368511a..0000000000
--- a/glib2/patches/patch-glib_gtimezone.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-glib_gtimezone.c,v 1.3 2018/04/17 08:03:38 wiz Exp $
-
-Bug 730332 - glib uses wrong timezone transition with zoneinfo 2014c
-https://bugzilla.gnome.org/show_bug.cgi?id=730332
-
-Patch from John Ralls.
-
---- glib/gtimezone.c.orig 2013-11-07 15:29:13.000000000 +0000
-+++ glib/gtimezone.c
-@@ -1558,7 +1558,11 @@ interval_end (GTimeZone *tz,
- guint interval)
- {
- if (tz->transitions && interval < tz->transitions->len)
-+ {
-+ if ((TRANSITION(interval)).time == G_MININT64)
-+ return G_MININT64;
- return (TRANSITION(interval)).time - 1;
-+ }
- return G_MAXINT64;
- }
-
diff --git a/glib2/patches/patch-gobject_Makefile.am b/glib2/patches/patch-gobject_Makefile.am
deleted file mode 100644
index 3bdc07a2e5..0000000000
--- a/glib2/patches/patch-gobject_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gobject_Makefile.am,v 1.1 2017/10/13 15:35:10 prlw1 Exp $
-
-Move python scripts to py-glib2-tools package.
-
---- gobject/Makefile.am.orig 2017-07-13 23:03:39.000000000 +0000
-+++ gobject/Makefile.am
-@@ -187,7 +187,6 @@ libgobject_2_0_la_SOURCES = $(gobject_ta
- # programs to compile and install
- #
- bin_PROGRAMS = gobject-query
--bin_SCRIPTS = glib-mkenums glib-genmarshal
- # source files
- gobject_query_SOURCES = gobject-query.c
- # link programs against libgobject
diff --git a/glib2/patches/patch-gobject_Makefile.in b/glib2/patches/patch-gobject_Makefile.in
deleted file mode 100644
index fd214de9a8..0000000000
--- a/glib2/patches/patch-gobject_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gobject_Makefile.in,v 1.1 2017/10/13 15:35:10 prlw1 Exp $
-
-Move python scripts to py-glib2-tools package.
-
---- gobject/Makefile.in.orig 2017-10-02 15:02:26.000000000 +0000
-+++ gobject/Makefile.in
-@@ -1007,7 +1007,6 @@ gen_sources = xgen-gmh xgen-gmc xgen-gms
- # target platform:
- libgobjectinclude_HEADERS = $(gobject_target_headers)
- libgobject_2_0_la_SOURCES = $(gobject_target_sources)
--bin_SCRIPTS = glib-mkenums glib-genmarshal
- # source files
- gobject_query_SOURCES = gobject-query.c
- # link programs against libgobject
Home |
Main Index |
Thread Index |
Old Index