Update glib2 to 2.48.0

- removed patch-gio_gtestdbus.c: applied upstream.
- removed patch-gio_gunixmounts.c: can no longer reproduce problem.

Overview of changes in GLib 2.48.0
==================================

 * a minor build fix in the name of determinism

 * a few coverity fixes

Bugs fixed:
 763617 giotypefuncs.c: Sort _get_type functions in the 'C' locale

Translations updated:
 Danish
 Italian

Overview of changes in GLib 2.47.92
===================================

 * gdbus-codegen now supports g_autoptr()

 * g_get_user_runtime_dir() now reliably returns an existing directory

 * g_array_remove_range() can now remove 0 items from the end of an array

 * Many fixes for Windows
   * build fixes
   * file monitoring
   * gsettings backend
   * streams
   * random numbers
   * wide character support

 * documentation improvements

 * other small bugfixes

Bugs fixed:
 724847 Segmentation fault on "gsettings list-recursively"
 743933 gapplication: add --app-id command line option
 756706 [PATCH] gio/gtestdbus.c: don't use non-standard %m printf modifier
 757506 gsettings: schema_list should use the passed schema's source
 760694 W32: Apps linked with -mwindows make cursor busy sometimes
 762202 g_win32_error_message improvements
 762637 build: Unconditionally dist tapset files
 762748 Undefined behavior
 762937 Mention that g_clear_error can be used with an "empty" GError
 763339 array: Support clearing an empty array with g_array_remove_range()
 763344 g_get_user_runtime_dir(): ensure directory exists
 763379 codegen: Add support for g_autoptr to gdbus-codegen–generated objects

Translations updated:
 Brazilian Portuguese
 Czech
 Finnish
 French
 Galician s
 German
 Greek
 Hebrew
 Hungarian
 Italian
 Kazakh
 Korean
 Latvian
 Lithuanian
 Occitan
 Polish
 Russian
 Serbian
 Slovak
 Slovenian
 Spanish
 Swedish

Overview of changes in GLib 2.47.6
==================================

* Windows usupport:
 - Fixes and improvements to the GSettings registry backend
 - Handle readability and writability of registry keys
 - Use Unicode registry APIs

* Bugs fixed:
760852 744772 761126 747927 761337 744570 761504 761550 761843
 744570 GString is missing (transfer none) annotations on many of its methods
 744772 systemtap and gdb scripts install in wrong place
 747927 Documentation: various small improvements
 760852 gdbusobjectmanagerserver: Clarify recommended ObjectManager paths
 761126 winiconv: update to upstream version
 761337 Fix some annotations
 761504 W32 registry GSettings backend does not use Unicode
 761550 Cannot build with default flags under Fedora rawhide (-Werror=format-...
 761843 gmacros.h is testing attributes with __has_feature (when compiling wi...

* Translation updates:
 Brazilian Portuguese
 Bulagarian
 Chinese (Taiwan)
 Hungarian
 Polish
 Slovak
 Slovenian
 Spanish
 Swedish


Overview of changes in GLib 2.47.5
==================================

* the system copy of PCRE is now used by default to implement GRegex.
  Configure with --with-pcre=internal if a system PCRE version
  is unavailable or undesired.

* interfaces for DTLS support have been added.  A new version of
  glib-networking will also be required.

* GDBusMethodInvocation now drops replies if the sender set the
  NO_REPLY_EXPECTED flag

* several GApplication fixes, including fixes for commandline arguments
  in interpreted languages on Windows

Bugs fixed:
 624186 Deprecate glib-gettext macros
 734095 gtk-demo.py of PyGObject fails to run on Windows (and likely other binding scripts using g_application_run())
 735754 Implement close on TLS GOutputStream
 748064 gnulib vfprintf returns desired (not actual) number of bytes, ignores errors
 752240 Add DTLS support to GIO
 755421 GDBus ignores NO_REPLY_EXPECTED flag in messages, leading to warnings on system bus
 756875 Include ntdef.h for NTSTATUS
 759554 g_application_run() calls g_main_context_default() repeatidly
 760199 gsettings: Install gettext ITS rules
 760215 G_LIKELY/_UNLIKELY macros need more parentheses
 760683 regex test: Check the expected PCRE exceptions at runtime

Translations updated:
 Brazilian Portuguese
 Czech
 German
 Lithuanian
 Swedish

Overview of changes in GLib 2.47.4
==================================

* The GApplication documentation has been improved in several areas.

* Bugs fixed:
 749092 gdb pretty-printers fail on Python 3 with a TypeError...
 757374 macros: clean up "inline" mess
 758641 Memory leak in g_dbus_proxy_new_for_bus_sync()
 759134 Add missing checks for gnulib vasnprintf()
 759408 Do not use uninitialized var
 756475 Stop supporting non-POSIX getpwuid_r, getgrgid_r
 757372 GApplication: destroy the impl on shutdown
 728099 macros: add G_GNUC_CHECK_VERSION() for compiler checks
 757299 glib-compile-resources: do not leak c_name
 758553 Fix gettext use
 758823 file monitors: reorder some code to avoid segfault
 756214 gsettings: Don't translate ""
 710243 Add GParamSpec object ref management annotations
 735696 xdgmime: Finer handling for cases where mmap() is not available
 752983 gapplication: Acquire the main context before running

* Translation updates:
 Swedish


Overview of changes in GLib 2.47.3
==================================

The inline cleanup in the last release accidentally removed three
symbols from libglib-2.0.so.  It is unlikely that this will have caused
any problems because these symbols were only backup symbols for
definitions exported as inlines in the header files, but ABI is ABI.

This release corrects only this problem.

Overview of changes in GLib 2.47.2
==================================

* We have formalised the assumption that all compilers that are
  interested in support 'static inline' and simplified the macros around
  this considerably.  Please watch for and report unintentional fallout.

* New API: hardware-assisted helpers for overflow-checked integer math.

* other fixes

Bugs fixed:
 696324 gtester-report doesn't work with Python 3.x
 719966 glib: Add missing (nullable) and (optional) annotations
 752837 gobject and glib-compile-resources rely on .CRT$XCU section, no longer works with Win 10 UCRT (VS 2015)
 755364 make gtkdoc-check happy again
 756134 Segmentation fault on calling g_simple_action_group_add_action with bad action constructor call
 756179 gwin32.c: Replace VerifyVersionInfoW() with RtlGetVersion() due to API deprecation
 756988 GSequence should document each function's complexity
 757294 Move G_POLLFD_FORMAT to glibconfig.h
 757374 macros: clean up "inline" mess
 757451 doc: fix g_task_attach_source() example
 757628 gio tests fail to build when cross compiling 2.46.1
 757693 Invalid free in g_local_file_trash()
 757742 Fix up annotations in ghash.c
 758181 GTask: fix wrong example code

Translations updated:
 Greek
 Hebrew
 Hungarian
 Norwegian bokmål
 Portuguese
 Scottish Gaelic
 Simplified Chinese
 Spanish

Overview of changes in GLib 2.47.1
==================================

* The Unicode support has been updated to version 8.0 of the Unicode standard

* GDesktopAppInfo no longer sets the DISPLAY environment variable when
  launching apps. This is now done in the GAppLaunchContext implementations
  when appropriate

* Bug fixes:
 664740 Key-value file parser, space after integer
 687223 cleverer GThreadPool management
 692085 stderr and stdout are not always file descriptors 1 and 2
 697907 Add interface for socket-like things (GSocket, DTLS, etc)
 735754 Implement close on TLS GOutputStream
 737116 Add functions to print GSocketConnectables and addresses as strings
 743011 Minor additions to GError documentation
 749161 undefined reference to `__imp__stat32i64'
 749314 Cannot restore a just-trashed file
 751924 Add recvmmsg()-like API on GSocket
 752240 Add DTLS support to GIO
 752837 gobject and glib-compile-resources rely on .CRT$XCU section, no longer...
 753310 Remove `#pragma GCC system_header` from gmessages.h
 753935 Update example namespace and class names in GObject tutorial
 754855 Object instantiation documentation refers to example that no longer ex...
 754983 Wayland: g_desktop_app_info_launch_uris_with_spawn() forces DISPLAY va...
 754994 g_date_time_get_second () sometimes returns an off-by-one result
 755083 Clarify in G_ADD_PRIVATE that it is safe to call _get_instance_private...
 755351 Example still contains g_autoptr(gchar)
 755355 Move GStrv to glib.h so it can be used with g_auto()
 755374 g_variant_get_child(): flatten-first logic on '&'
 755496 glib 2.46 fails GStreamer test suite
 755609 glib 2.46.0 breaks Sun Java JVM 1.8.0.60
 755766 gvalue: The g_auto cleanup function assert if value is G_VALUE_INIT
 755795 2.46 considers empty files as octet-stream rather than text (leads to...
 755961 Fix up annotations in gbytes.c
 756053 MSVC doesn't understand the symbol 'msghdr'
 756054 MSVC linker error due to 'g_socket_send_message_with_timeout()'
 756077 testutils: remove internal ABI comment
 756099 g_main_context_query(): Annotate @n_fds as (in) parameter
 756139 musl: ctors called in the wrong order
 756179 gwin32.c: Replace VerifyVersionInfoW() with RtlGetVersion() due to AP...
 756251 The documentation of G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START is confusing
 756255 GOutputStream swallowing errors in splice with G_OUTPUT_STREAM_SPLICE...
 756316 GSequence should provide fast api to check if empty
 756382 snprintf used on Windows with VS2015 doesn't support %n
 756477 gio/gthreadedresolver.c has outdated copy of bionic headers (for android)
 756550 gtypes.h: Make G_MININTn literals negative
 756875 Include ntdef.h for NTSTATUS
 756952 giomodule: return a copy of module name

* Translation updates:
 Basque
 Czech
 Serbian
 Serbian Latin
 Vietnamese


Overview of changes in GLib 2.46.0
==================================

* Disable runtime-deprecation warnings

* Fix marshalling of flags on bigendian 64bit architectures

* Translation updates
 Brazilian Portuguese
 Danish
 German
 Latvian
 Russian
 Turkish


Overview of changes in GLib 2.45.8
==================================

* utf8 validation and utf8-to-ucs4 conversion are faster

* Small speedups to property change notification

* Various other small optimizations for GQuark, GData

* Bugs fixed:
 696426 GParamSpecTypeInfo do not need to be static
 735429 Cleanup MSVC Project Files Generation
 738504 Optimize UTF-8 decoding by unrolling branches and expressions
 742903 Add missing (transfer) annotation to GString
 748633 g_set_object order of operations
 754431 Fix build of glib/gstrfuncs.c on Windows
 754560 gioerror: Add more mappings for WinSock error codes
 754582 Glib cannot compile
 754601 Make g_strerror work with non-glibc POSIX systems
 754636 tests/unicode-encoding test fails for glib 2.45.7 on x86-64
 754788 more g_strerror stuff
 754831 autocleanups: Add GString type
 754924 Improve test coverage of g_utf8_validate() by added known-...
 754986 Avoid unnecessary signal emission during draw

* Translation updates:
 Italian
 Kazakh
 Korean
 Lithuanian
 Slovenian
 Swedish


Overview of changes in GLib 2.45.7
==================================

* Add G_FILE_ATTRIBUTE_STANDARD_IS_VOLATILE for use by non-POSIX-like
  backends (e.g. cloud storage).

* GFileMonitor: Make the inotify backend work with atomic renames again

* GSettings: change notification is again working unconditionally

* GListStore has a sort function now

* Test infrastructure:
 - Tests are now required to have unique names
 - TAP support has been improved
 - A macro for asserting that two memory regions have identical content
   has been added

* Bugs fixed:
 708525 A "g_file_query_info" on the file path "/sys/kernel/debug/hid"...
 742849 inotify: send paired events to both sides
 744060 Update GObject tutorial documentation to use G_DECLARE_FINAL_T...
 747364 Fix GError leak in g_file_query_writable_namespaces()
 749492 Support file creation time on FreeBSD and NetBSD
 752769 (g_socket_receive_message | g_socket_send_message) performance
 753745 glib-genmarshal still needed for cross-compilation
 754152 Add g_list_store_sort
 754211 Memory leak in g_file_enumerator_iterate ()
 754264 GLib 2.44 certificate chain construction fails if the PEM incl...
 754283 gtestutils: add g_assert_cmpmem()
 754284 gtestutils: print the TAP test plan first, not last
 754286 misc gtestutils fixes
 754307 size of array '_GStaticAssertCompileTimeAssertion_3387' is neg...


* Translation updates:
 Chinese (Taiwan)
 French
 Galician
 Greek
 Hebrew
 Hungarian
 Indonesian
 Polish
 Portuguese


Overview of changes in GLib 2.45.6
==================================

* Fix a test failure and a build failure

Overview of changes in GLib 2.45.5
==================================

* GNetworkMonitor now provides information about metered networks

* g_mem_set_vtable has been deprecated; it has not been working for
  quite a while. The recommendation is to use valgrind, or replace
  malloc itself.

* Bugs fixed:
 656325 Make GDBusInterfaceVTable binding friendly
 741779 Documentation tweaks addressing real-world API misuses
 741822 Fails to build with VS 2015
 742386 gdbusconnection: Don't g_printerr() when exiting
 743018 gobject: Add more cross-links between documentation pages
 750282 Add g_network_monitor_get_network_metered() to get if the connection...
 751358 GFileMonitor doesn't react to "mv some-file watched-file"
 751592 Stop using GMemVtable
 751598 Stop 'handle-local-options' propagation when callback reports an err...
 751610 g_str_hash produces collisions with strings of length 2
 751751 Wrong docs of g_async_queue_remove
 752210 gdbus command crashes with SIGSEGV
 752656 gdbusconnection: Fix signal subscription documentation
 752767 Fix typo in g_hash_table_replace() documentation
 753278 gdbus: Don't use g_assert_no_error() GDBusObjectManagerServer
 753285 g_menu_item_set_icon fails if called with NULL icon

* Translation updates:
 Catalan
 Czech
 French
 Indonesian
 Lithuanian
 Norwegian bokmål
 Slovak
 Spanish
 Thai
 Turkish


Overview of changes in GLib 2.45.4
==================================

* Bugs fixed:
 727829 win32: glibconfig.h.win32 updates
 741901 Clang cannot know that g_error don't return
 746339 GSocket kills process when fd is not a socket
 747676 gio/tests/socket fails: test_fd_roundtrip
 748610 Some tests fail with non-English locales
 749911 g_inet_address_to_string broken on XP/2003
 749912 g_inet_address_new_from_string broken on XP/2003
 750625 Should dismiss Software Updates Available notification after...
 750807 G_BREAKPOINT doesn't work as intended on Darwin
 751160 gtask does unnecessary work
 751672 -Wduplicate-decl-specifier in glib/tests/keyfile.c
 751731 GFile/DirectoryMonitor emit move events with other_file=NULL
 751737 gio/tests/appmonitor test fails in 2.45.3
 751798 Wrong enum type used in some test-cases
 752089 make gsocketservice::active a property
 752293 small cleanup: use list_free_full

* Translation updates:
 Greek
 Hebrew
 Portuguese


Overview of changes in GLib 2.45.3
==================================

* Improve performance of g_signal_handler_disconnect for signals
  with many handlers

* GDBus has gained a new call flag to allow interactive authorization

* GSettings:
 - New API: g_settings_schema_list_keys
 - Deprecated: g_settings_list_keys

* OS X:
 - Implement GNotification
 - Bump the OS X requirement to 10.9

* Windows:
 - Add registry reading API
 - Reimplement GAppInfo using registry information

* Bugs fixed:
 666831 Support URI opening on W32
 728489 property action with inverted boolean state
 730168 Incorrect annotation on g_action_group_get_action_state_type return...
 733325 Several regex tests fail with pcre3 8.35
 734888 GLib has no helper functions to work with W32 Registry
 737009 signal handler lookup doesn't scale
 738185 Misleading language about "file name encoding" in the docs on g_env...
 738504 Optimize UTF-8 decoding by unrolling branches and expressions
 739122 glib not handling -1 return ("no limit") from sysconf (_SC_THREAD_S...
 739424 gnome-shell crashes when files are added, deleted, or modified in $...
 739616 DBus; Add new call flag to allow interactive authorization
 740308 Add g_settings_schema_list_keys() method
 740516 RFE: please provide an introspectible version of g_log_set_handler
 741788 Document GSettings build system integration
 745013 GBinding not thread safe
 747146 Implement GNotification on OSX
 747941 try XDG_RUNTIME_DIR/bus before falling back to X11 autolaunch (dbus...
 748727 Filechooser dialog shows no icons for directories on W32
 749693 GActionGroupExporter: flush queue on requests
 750203 GNetworkMonitorNetlink hangs in user namespace
 750322 gapplication: Make sure --help output is translated
 750344 GTlsInteractionClass is missing from doc
 750369 Various GBinding cleanups
 750386 Race condition in g_io_condition_get_type
 750399 Typo "equilalent" in glib documentation's glib-Error-Reporting.html...
 750573 GTlsDatabaseClass is not documented
 750918 genmarshal: silence register storage class warnings
 751122 gsocket: avoid unnecessary g_socket_cond_wait() in _send_messages()
 479730 The "g_key_file_set_comment" interface prepends '#' character to...

* Translation updates:
 Hungarian
 Spanish


Overview of changes in GLib 2.45.2
==================================

* Improve error reporting in glib-compile-schemas.

* Add introspection annotations to GListStore.

* Bugs fixed:
 696749 win32 : failed to compile because of careless mistake in the code
 723394 const parameter to GtkPopover gtk_popover_set_pointing_to
 724113 gdbus-connection-loss test can fail on slow machines
 725981 tap-driver.sh: internal error getting exit status
 733325 Several regex tests fail with pcre3 8.35
 744895 Unknown or unsupported transport 'this-should-not-be-used-and-will...
 747882 gtype: Bump allowed number of children
 748534 gtest: if a subprocess assertion fails, print its stdout and stderr
 748612 de_DE locale used in option-context test is not supported by FreeBSD
 748614 Double unref in g_socket_listener_add_inet_port
 748834 glocalfilemonitor: Emit notification on rate limit change
 749079 gdbus-peer test: TCP tests can fail with ECONNRESET due to a race...
 749080 gdatetime test: fails if close to rollover between seconds
 749180 gnetworkaddress: add return type annotation to parse methods
 749352 g_binding_unbind() fails when source is also the target
 749353 GBinding does not connect to the detailed notify signal

* Translation updates:
 Catalan
 French
 Slovak
 Thai


Overview of changes in GLib 2.45.1
==================================

* The GSettings schema compiler, glib-compile-schemas has been changed
  to reject schema xml that has duplicate <summary> or <description>
  elements. Such elements typically occur when translations are merged
  into the schema, with xml:lang attributes. This is not the correct
  way to translate schemas. Instead keep the translations in the .mo
  file and set the gettext-domain attribute on the <schemalist> element.

* The file monitoring infrastructure has been rewritten, and all backends
  have seen major improvements.

  The inotify backend is reporting events with less delay (no event will
  be delayed more than 10ms) and wakeups due to file monitoring have been
  significantly reduced. A CHANGES_DONE event will also be sent when new
  files appear.

  The poll implementation is now using the thread default main context.

  The fam implmentation is now running in the worker thread.

  The fen implementation has been removed, since it was unmaintained.

* The GSettings schema compiler, glib-compile-schemas, is more strict
  about rejecting schemas with xml:lang style merged translations.
  Schema translations should be done by specifying the gettext domain
  in the xml, and keeping the translations in gettext. To avoid breaking
  already-installed schemas, this change is only taking effect when
  you use the --strict option.

* The hardcoded 10-thread limit of GTask's thread pool has been removed,
  since it was prone to causing deadlocks. The thread pool is now allowed
  to grow dynamically and will shrink back over time.

* GSimpleAsyncResult has been deprecated in favor of GTask.

* The algorithm used by GAppInfo to find default handlers for mime types
  has been tweaked to prefer apps that handle the specific subtype over
  default handlers for a generic supertype.

* Bug fixes:
 627285 inotify file monitor hardwired delay
 631597 Segmentation fault in append_escaped_text
 661767 merge/improve various bits of run-in-thread functionality
 687223 cleverer GThreadPool management
 711547 win32: silence some build warnings
 719966 glib: Add missing (nullable) and (optional) annotations
 726447 Possibly an error in text string
 728663 W32: wrong stat struct is used when built with MinGW-w64
 728669 W32: GLocalFile can't measure size of files larger than 2^32...
 730188 gsocket: Document FD ownership with g_socket_new_from_fd()
 733325 Several regex tests fail with pcre3 8.35
 738207 Add a way to set SO_SENDBUF and SO_RECVBUF on listener (and...
 739850 GClosure: add valgrind hints
 741791 gmain: Save errno when handling unix signals
 744282 gvfs-open for application/x-virt-viewer changed behaviour bet...
 745255 Add support for copying sessions between GTlsClientConnections
 745745 gdbus: fix out-of-bound array access
 745821 Don't use __alloc_size__ attribute with clang
 746749 GLib-GIO:ERROR:inotify-kernel.c:327:ik_source_dispatch: ass...
 746753 Glib-compile-resources --generate-header not using ".h" as ...
 747209 glib-compile-schemas ought to reject repeated <summary> and...
 747349 Conversion of gdbus to use GTask causes deadlocks
 747363 gatomic: Add missing new line in API doc comment
 747472 Don't ignore already-installed schemas with multiple <summa...
 747541 gdbus segfaults with invalid --dest
 747772 Having hardcoded utf8 strings in the source code does not p...
 748019 gsocketconnection: Fix copy-pasto in documentation
 748177 not all test schemas are distributed, "make distcheck" fails

* Translation updates:
 Basque
 Czech
 Danish
 Finnish
 German
 Hebrew
 Icelandic
 Norwegian bokmål
 Russian
 Turkish

8 files changed, 67 insertions, 475 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 1bf9f7bd373..7c4eb06718d 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.227 2015/06/12 10:48:49 wiz Exp $
+# $NetBSD: Makefile,v 1.228 2016/04/07 18:33:05 prlw1 Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 CATEGORIES=		devel gnome
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 432f2d7486b..f50a7e0f457 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2016/02/25 12:12:47 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.47 2016/04/07 18:33:05 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -6,7 +6,7 @@
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=	glib-2.44.1
+DISTNAME=	glib-2.48.0
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 CATEGORIES=	# empty; redefined in Makefile
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 5587b02ff51..037d58b4751 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.84 2015/06/10 23:00:05 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.85 2016/04/07 18:33:05 prlw1 Exp $
 bin/gapplication
 bin/gdbus
 bin/gio-querymodules
@@ -41,6 +41,7 @@ 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
@@ -66,6 +67,9 @@ 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
@@ -286,16 +290,14 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load/libglib-2.0.so.0.4400.1-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.4400.1-gdb.py
+share/gdb/auto-load/usr/pkg/lib/libglib-2.0.so.0.4800.0-gdb.py
+share/gdb/auto-load/usr/pkg/lib/libgobject-2.0.so.0.4800.0-gdb.py
+share/gettext/its/gschema.its
+share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/po/Makefile.in.in
 share/glib-2.0/schemas/gschema.dtd
-share/gtk-doc/html/gio/ExampleAnimal.html
-share/gtk-doc/html/gio/ExampleCat.html
-share/gtk-doc/html/gio/ExampleObject.html
-share/gtk-doc/html/gio/ExampleObjectManagerClient.html
 share/gtk-doc/html/gio/GAction.html
 share/gtk-doc/html/gio/GActionGroup.html
 share/gtk-doc/html/gio/GActionMap.html
@@ -330,7 +332,11 @@ 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
@@ -439,6 +445,8 @@ share/gtk-doc/html/gio/api-index-2-38.html
 share/gtk-doc/html/gio/api-index-2-40.html
 share/gtk-doc/html/gio/api-index-2-42.html
 share/gtk-doc/html/gio/api-index-2-44.html
+share/gtk-doc/html/gio/api-index-2-46.html
+share/gtk-doc/html/gio/api-index-2-48.html
 share/gtk-doc/html/gio/api-index-deprecated.html
 share/gtk-doc/html/gio/api-index-full.html
 share/gtk-doc/html/gio/application.html
@@ -446,22 +454,21 @@ 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/ch31.html
 share/gtk-doc/html/gio/ch32.html
-share/gtk-doc/html/gio/ch32s02.html
-share/gtk-doc/html/gio/ch32s03.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/ch33s04.html
-share/gtk-doc/html/gio/ch33s05.html
-share/gtk-doc/html/gio/ch33s06.html
-share/gtk-doc/html/gio/ch33s07.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
@@ -472,9 +479,8 @@ 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-org.gtk.GDBus.Example.ObjectManager.Animal.html
-share/gtk-doc/html/gio/gdbus-org.gtk.GDBus.Example.ObjectManager.Cat.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
@@ -493,6 +499,7 @@ 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
@@ -521,6 +528,7 @@ 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
@@ -563,6 +571,8 @@ share/gtk-doc/html/glib/api-index-2-4.html
 share/gtk-doc/html/glib/api-index-2-40.html
 share/gtk-doc/html/glib/api-index-2-42.html
 share/gtk-doc/html/glib/api-index-2-44.html
+share/gtk-doc/html/glib/api-index-2-46.html
+share/gtk-doc/html/glib/api-index-2-48.html
 share/gtk-doc/html/glib/api-index-2-6.html
 share/gtk-doc/html/glib/api-index-2-8.html
 share/gtk-doc/html/glib/api-index-deprecated.html
@@ -577,6 +587,7 @@ 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
@@ -692,6 +703,7 @@ share/gtk-doc/html/gobject/api-index-2-4.html
 share/gtk-doc/html/gobject/api-index-2-40.html
 share/gtk-doc/html/gobject/api-index-2-42.html
 share/gtk-doc/html/gobject/api-index-2-44.html
+share/gtk-doc/html/gobject/api-index-2-46.html
 share/gtk-doc/html/gobject/api-index-2-6.html
 share/gtk-doc/html/gobject/api-index-2-8.html
 share/gtk-doc/html/gobject/api-index-deprecated.html
@@ -789,6 +801,7 @@ share/locale/fa/LC_MESSAGES/glib20.mo
 share/locale/fi/LC_MESSAGES/glib20.mo
 share/locale/fr/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
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 7adde13ceea..4e1383cbcb7 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.214 2016/03/02 17:19:33 jperkin Exp $
+$NetBSD: distinfo,v 1.215 2016/04/07 18:33:05 prlw1 Exp $
 
-SHA1 (glib-2.44.1.tar.xz) = 88176375f97ecd9ff45e7b5fd5ab80d4b7db6b34
-RMD160 (glib-2.44.1.tar.xz) = 40db36e25c4baf5bdcdde34379d4968e9b35557c
-SHA512 (glib-2.44.1.tar.xz) = c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888
-Size (glib-2.44.1.tar.xz) = 7132940 bytes
+SHA1 (glib-2.48.0.tar.xz) = afe88c1d64a0f9bdc140e87a84ef9423ce476ca5
+RMD160 (glib-2.48.0.tar.xz) = 647bb92c1c6e94042533dda8a3cebc0b3d2693c8
+SHA512 (glib-2.48.0.tar.xz) = 684544bc594d9f6c905495d895daed40b074bcf5fa835aefb9a1034afc9564b2bd464e68d4c378c210e96918ef5d5202350da53a7104794420e990049ddbebf5
+Size (glib-2.48.0.tar.xz) = 7487800 bytes
 SHA1 (patch-aa) = d197ded7ca05c2e37396e6c6b185797bd9bb2821
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -14,17 +14,15 @@ SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
 SHA1 (patch-ak) = edf116968bd3c787fea77787add7e0164b6f1ffb
 SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = 8dfc12cf0c8f3b8c7948fe3b2543a56e0cacec98
+SHA1 (patch-an) = ce167f6441480b1c0299350a23e087c6de942018
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
-SHA1 (patch-cd) = 0d574419257a604ca19e18a43aa42ec6e9a36c78
+SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
 SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
 SHA1 (patch-cl) = 871e1ca59f697eddd6692702fc7d63a2df826afc
 SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
 SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
-SHA1 (patch-gio_gtestdbus.c) = 562d8b2f3c235d27a2ba252ff1a778b8b3e4c413
-SHA1 (patch-gio_gunixmounts.c) = 40edf6a79d37bf8eca38d0f84521a7538443c00c
 SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
 SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
 SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
index 2eb038e9ed5..7e37e551e6d 100644
--- a/devel/glib2/patches/patch-an
+++ b/devel/glib2/patches/patch-an
@@ -1,28 +1,38 @@
-$NetBSD: patch-an,v 1.12 2014/09/05 20:49:55 prlw1 Exp $
+$NetBSD: patch-an,v 1.13 2016/04/07 18:33:05 prlw1 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.
 
---- gio/Makefile.in.orig	2014-03-24 18:54:27.000000000 +0000
+--- gio/Makefile.in.orig	2016-02-16 11:35:28.000000000 +0000
 +++ gio/Makefile.in
-@@ -1198,8 +1198,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
+@@ -879,8 +879,7 @@ am__set_b = \
+     *) \
+       b='$*';; \
+   esac
+-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \
+-	fam
++DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . fam
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
+ 	$(srcdir)/gnetworking.h.in \
+ 	$(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/depcomp \
+@@ -1257,8 +1256,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_19) \
--	$(am__append_22) $(am__append_26) $(am__append_29) . tests \
+-	$(am__append_22) $(am__append_25) . tests $(am__append_28)
 +SUBDIRS = $(am__append_15) $(am__append_19) \
-+	$(am__append_22) $(am__append_26) $(am__append_29) . \
- 	$(am__append_32)
++	$(am__append_22) $(am__append_25) . $(am__append_28)
  @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
-@@ -4311,7 +4311,7 @@ info: info-recursive
+ AM_CPPFLAGS = \
+@@ -4547,7 +4546,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-completionDATA install-data-local \
 +install-data-am: install-data-local \
- 	install-dist_schemaDATA install-gioincludeHEADERS \
- 	install-giounixincludeHEADERS install-giowin32includeHEADERS \
- 	install-installed_testLTLIBRARIES \
+ 	install-dist_itsDATA install-dist_schemaDATA \
+ 	install-gioincludeHEADERS install-giounixincludeHEADERS \
+ 	install-giowin32includeHEADERS \
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd
index 1d1da8baf4e..68ff3d33061 100644
--- a/devel/glib2/patches/patch-cd
+++ b/devel/glib2/patches/patch-cd
@@ -1,12 +1,12 @@
-$NetBSD: patch-cd,v 1.8 2013/12/08 13:08:59 prlw1 Exp $
+$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	2013-10-15 19:14:51.000000000 +0000
+--- gio/fam/Makefile.in.orig	2016-02-16 11:35:28.000000000 +0000
 +++ gio/fam/Makefile.in
-@@ -175,10 +175,7 @@ am__installdirs = "$(DESTDIR)$(giomodule
+@@ -183,10 +183,7 @@ am__installdirs = "$(DESTDIR)$(giomodule
  LTLIBRARIES = $(giomodule_LTLIBRARIES) $(installed_test_LTLIBRARIES) \
  	$(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -15,10 +15,10 @@ package.
 -	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
 -	$(am__DEPENDENCIES_1)
 +libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__objects_1 =
- am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
- 	libgiofam_la-fam-module.lo \
-@@ -792,9 +789,7 @@ libgiofam_la_CFLAGS = \
+ 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 = \
@@ -29,7 +29,7 @@ package.
  		$(GLIB_LIBS) \
  		$(FAM_LIBS) \
  		$(NULL)
-@@ -1639,9 +1634,6 @@ check-local: test-nonrecursive
+@@ -1559,9 +1554,6 @@ check-local: test-nonrecursive
  @ENABLE_INSTALLED_TESTS_TRUE@	mv $@.tmp $@)
  
  install-data-hook:
diff --git a/devel/glib2/patches/patch-gio_gtestdbus.c b/devel/glib2/patches/patch-gio_gtestdbus.c
deleted file mode 100644
index e05741f041a..00000000000
--- a/devel/glib2/patches/patch-gio_gtestdbus.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-gio_gtestdbus.c,v 1.2 2015/10/16 17:00:24 tnn Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756706
-
---- gio/gtestdbus.c.orig	2015-05-13 02:39:04.000000000 +0000
-+++ gio/gtestdbus.c
-@@ -25,6 +25,8 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <gstdio.h>
-+#include <errno.h>
-+#include <string.h> /* for strerror(3) */
- #ifdef G_OS_UNIX
- #include <unistd.h>
- #endif
-@@ -243,14 +245,14 @@ watcher_init (void)
-       /* fork a child to clean up when we are killed */
-       if (pipe (pipe_fds) != 0)
-         {
--          g_warning ("pipe() failed: %m");
-+          g_warning ("pipe() failed: %s", strerror(errno));
-           g_assert_not_reached ();
-         }
- 
-       switch (fork ())
-         {
-         case -1:
--          g_warning ("fork() failed: %m");
-+          g_warning ("fork() failed: %s", strerror(errno));
-           g_assert_not_reached ();
-           break;
- 
diff --git a/devel/glib2/patches/patch-gio_gunixmounts.c b/devel/glib2/patches/patch-gio_gunixmounts.c
deleted file mode 100644
index 956273423c0..00000000000
--- a/devel/glib2/patches/patch-gio_gunixmounts.c
+++ /dev/null
@@ -1,396 +0,0 @@
-$NetBSD: patch-gio_gunixmounts.c,v 1.1 2015/06/10 23:00:05 prlw1 Exp $
-
-Revert commit 548c165a Make GUnixMountMonitor per-context
-https://bugzilla.gnome.org/show_bug.cgi?id=750708
-
---- gio/gunixmounts.c.orig	2015-03-13 20:48:21.000000000 +0000
-+++ gio/gunixmounts.c
-@@ -68,7 +68,6 @@
- #include "gfilemonitor.h"
- #include "glibintl.h"
- #include "gthemedicon.h"
--#include "gcontextspecificgroup.h"
- 
- 
- #ifdef HAVE_MNTENT_H
-@@ -1275,50 +1274,124 @@ static guint signals[LAST_SIGNAL];
- struct _GUnixMountMonitor {
-   GObject parent;
- 
--  GMainContext *context;
-+  GFileMonitor *fstab_monitor;
-+  GFileMonitor *mtab_monitor;
-+
-+  GList *mount_poller_mounts;
-+
-+  GSource *proc_mounts_watch_source;
- };
- 
- struct _GUnixMountMonitorClass {
-   GObjectClass parent_class;
- };
- 
-+static GUnixMountMonitor *the_mount_monitor = NULL;
- 
- G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
- 
--static GContextSpecificGroup  mount_monitor_group;
--static GFileMonitor          *fstab_monitor;
--static GFileMonitor          *mtab_monitor;
--static GSource               *proc_mounts_watch_source;
--static GList                 *mount_poller_mounts;
-+static void
-+g_unix_mount_monitor_finalize (GObject *object)
-+{
-+  GUnixMountMonitor *monitor;
-+  
-+  monitor = G_UNIX_MOUNT_MONITOR (object);
-+
-+  if (monitor->fstab_monitor)
-+    {
-+      g_file_monitor_cancel (monitor->fstab_monitor);
-+      g_object_unref (monitor->fstab_monitor);
-+    }
-+  
-+  if (monitor->proc_mounts_watch_source != NULL)
-+    g_source_destroy (monitor->proc_mounts_watch_source);
-+
-+  if (monitor->mtab_monitor)
-+    {
-+      g_file_monitor_cancel (monitor->mtab_monitor);
-+      g_object_unref (monitor->mtab_monitor);
-+    }
-+
-+  g_list_free_full (monitor->mount_poller_mounts, (GDestroyNotify)g_unix_mount_free);
-+
-+  the_mount_monitor = NULL;
-+
-+  G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-+}
-+
-+
-+static void
-+g_unix_mount_monitor_class_init (GUnixMountMonitorClass *klass)
-+{
-+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-+
-+  gobject_class->finalize = g_unix_mount_monitor_finalize;
-+ 
-+  /**
-+   * GUnixMountMonitor::mounts-changed:
-+   * @monitor: the object on which the signal is emitted
-+   * 
-+   * Emitted when the unix mounts have changed.
-+   */ 
-+  signals[MOUNTS_CHANGED] =
-+    g_signal_new ("mounts-changed",
-+		  G_TYPE_FROM_CLASS (klass),
-+		  G_SIGNAL_RUN_LAST,
-+		  0,
-+		  NULL, NULL,
-+		  g_cclosure_marshal_VOID__VOID,
-+		  G_TYPE_NONE, 0);
-+
-+  /**
-+   * GUnixMountMonitor::mountpoints-changed:
-+   * @monitor: the object on which the signal is emitted
-+   * 
-+   * Emitted when the unix mount points have changed.
-+   */
-+  signals[MOUNTPOINTS_CHANGED] =
-+    g_signal_new ("mountpoints-changed",
-+		  G_TYPE_FROM_CLASS (klass),
-+		  G_SIGNAL_RUN_LAST,
-+		  0,
-+		  NULL, NULL,
-+		  g_cclosure_marshal_VOID__VOID,
-+		  G_TYPE_NONE, 0);
-+}
- 
- static void
- fstab_file_changed (GFileMonitor      *monitor,
--                    GFile             *file,
--                    GFile             *other_file,
--                    GFileMonitorEvent  event_type,
--                    gpointer           user_data)
-+		    GFile             *file,
-+		    GFile             *other_file,
-+		    GFileMonitorEvent  event_type,
-+		    gpointer           user_data)
- {
-+  GUnixMountMonitor *mount_monitor;
-+
-   if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
-       event_type != G_FILE_MONITOR_EVENT_CREATED &&
-       event_type != G_FILE_MONITOR_EVENT_DELETED)
-     return;
- 
--  g_context_specific_group_emit (&mount_monitor_group, signals[MOUNTPOINTS_CHANGED]);
-+  mount_monitor = user_data;
-+  g_signal_emit (mount_monitor, signals[MOUNTPOINTS_CHANGED], 0);
- }
- 
- static void
- mtab_file_changed (GFileMonitor      *monitor,
--                   GFile             *file,
--                   GFile             *other_file,
--                   GFileMonitorEvent  event_type,
--                   gpointer           user_data)
-+		   GFile             *file,
-+		   GFile             *other_file,
-+		   GFileMonitorEvent  event_type,
-+		   gpointer           user_data)
- {
-+  GUnixMountMonitor *mount_monitor;
-+
-   if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
-       event_type != G_FILE_MONITOR_EVENT_CREATED &&
-       event_type != G_FILE_MONITOR_EVENT_DELETED)
-     return;
--
--  g_context_specific_group_emit (&mount_monitor_group, signals[MOUNTS_CHANGED]);
-+  
-+  mount_monitor = user_data;
-+  g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
- }
- 
- static gboolean
-@@ -1326,21 +1399,23 @@ proc_mounts_changed (GIOChannel   *chann
-                      GIOCondition  cond,
-                      gpointer      user_data)
- {
-+  GUnixMountMonitor *mount_monitor = G_UNIX_MOUNT_MONITOR (user_data);
-   if (cond & G_IO_ERR)
--    g_context_specific_group_emit (&mount_monitor_group, signals[MOUNTS_CHANGED]);
--
-+    g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
-   return TRUE;
- }
- 
- static gboolean
- mount_change_poller (gpointer user_data)
- {
-+  GUnixMountMonitor *mount_monitor;
-   GList *current_mounts, *new_it, *old_it;
-   gboolean has_changed = FALSE;
- 
-+  mount_monitor = user_data;
-   current_mounts = _g_get_unix_mounts ();
- 
--  for ( new_it = current_mounts, old_it = mount_poller_mounts;
-+  for ( new_it = current_mounts, old_it = mount_monitor->mount_poller_mounts;
-         new_it != NULL && old_it != NULL;
-         new_it = g_list_next (new_it), old_it = g_list_next (old_it) )
-     {
-@@ -1353,55 +1428,34 @@ mount_change_poller (gpointer user_data)
-   if (!(new_it == NULL && old_it == NULL))
-     has_changed = TRUE;
- 
--  g_list_free_full (mount_poller_mounts, (GDestroyNotify) g_unix_mount_free);
-+  g_list_free_full (mount_monitor->mount_poller_mounts,
-+                    (GDestroyNotify)g_unix_mount_free);
- 
--  mount_poller_mounts = current_mounts;
-+  mount_monitor->mount_poller_mounts = current_mounts;
- 
-   if (has_changed)
-     {
--      mount_poller_time = (guint64) g_get_monotonic_time ();
--      g_context_specific_group_emit (&mount_monitor_group, signals[MOUNTPOINTS_CHANGED]);
-+      mount_poller_time = (guint64)g_get_monotonic_time ();
-+      g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
-     }
- 
-   return TRUE;
- }
- 
--
--static void
--mount_monitor_stop (void)
--{
--  if (fstab_monitor)
--    {
--      g_file_monitor_cancel (fstab_monitor);
--      g_object_unref (fstab_monitor);
--    }
--
--  if (proc_mounts_watch_source != NULL)
--    g_source_destroy (proc_mounts_watch_source);
--
--  if (mtab_monitor)
--    {
--      g_file_monitor_cancel (mtab_monitor);
--      g_object_unref (mtab_monitor);
--    }
--
--  g_list_free_full (mount_poller_mounts, (GDestroyNotify) g_unix_mount_free);
--}
--
- static void
--mount_monitor_start (void)
-+g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
- {
-   GFile *file;
--
-+    
-   if (get_fstab_file () != NULL)
-     {
-       file = g_file_new_for_path (get_fstab_file ());
--      fstab_monitor = g_file_monitor_file (file, 0, NULL, NULL);
-+      monitor->fstab_monitor = g_file_monitor_file (file, 0, NULL, NULL);
-       g_object_unref (file);
--
--      g_signal_connect (fstab_monitor, "changed", (GCallback)fstab_file_changed, NULL);
-+      
-+      g_signal_connect (monitor->fstab_monitor, "changed", (GCallback)fstab_file_changed, monitor);
-     }
--
-+  
-   if (get_mtab_monitor_file () != NULL)
-     {
-       const gchar *mtab_path;
-@@ -1423,93 +1477,39 @@ mount_monitor_start (void)
-             }
-           else
-             {
--              proc_mounts_watch_source = g_io_create_watch (proc_mounts_channel, G_IO_ERR);
--              g_source_set_callback (proc_mounts_watch_source,
-+              monitor->proc_mounts_watch_source = g_io_create_watch (proc_mounts_channel, G_IO_ERR);
-+              g_source_set_callback (monitor->proc_mounts_watch_source,
-                                      (GSourceFunc) proc_mounts_changed,
--                                     NULL, NULL);
--              g_source_attach (proc_mounts_watch_source,
-+                                     monitor,
-+                                     NULL);
-+              g_source_attach (monitor->proc_mounts_watch_source,
-                                g_main_context_get_thread_default ());
--              g_source_unref (proc_mounts_watch_source);
-+              g_source_unref (monitor->proc_mounts_watch_source);
-               g_io_channel_unref (proc_mounts_channel);
-             }
-         }
-       else
-         {
-           file = g_file_new_for_path (mtab_path);
--          mtab_monitor = g_file_monitor_file (file, 0, NULL, NULL);
-+          monitor->mtab_monitor = g_file_monitor_file (file, 0, NULL, NULL);
-           g_object_unref (file);
--          g_signal_connect (mtab_monitor, "changed", (GCallback)mtab_file_changed, NULL);
-+          g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
-         }
-     }
-   else
-     {
--      proc_mounts_watch_source = g_timeout_source_new_seconds (3);
--      mount_poller_mounts = _g_get_unix_mounts ();
-+      monitor->proc_mounts_watch_source = g_timeout_source_new_seconds (3);
-+      monitor->mount_poller_mounts = _g_get_unix_mounts ();
-       mount_poller_time = (guint64)g_get_monotonic_time ();
--      g_source_set_callback (proc_mounts_watch_source,
--                             mount_change_poller,
--                             NULL, NULL);
--      g_source_attach (proc_mounts_watch_source,
-+      g_source_set_callback (monitor->proc_mounts_watch_source,
-+                             (GSourceFunc)mount_change_poller,
-+                             monitor, NULL);
-+      g_source_attach (monitor->proc_mounts_watch_source,
-                        g_main_context_get_thread_default ());
--      g_source_unref (proc_mounts_watch_source);
-+      g_source_unref (monitor->proc_mounts_watch_source);
-     }
- }
- 
--static void
--g_unix_mount_monitor_finalize (GObject *object)
--{
--  GUnixMountMonitor *monitor;
--
--  monitor = G_UNIX_MOUNT_MONITOR (object);
--
--  g_context_specific_group_remove (&mount_monitor_group, monitor->context, monitor, mount_monitor_stop);
--
--  G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
--}
--
--static void
--g_unix_mount_monitor_class_init (GUnixMountMonitorClass *klass)
--{
--  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
--
--  gobject_class->finalize = g_unix_mount_monitor_finalize;
-- 
--  /**
--   * GUnixMountMonitor::mounts-changed:
--   * @monitor: the object on which the signal is emitted
--   * 
--   * Emitted when the unix mounts have changed.
--   */ 
--  signals[MOUNTS_CHANGED] =
--    g_signal_new ("mounts-changed",
--		  G_TYPE_FROM_CLASS (klass),
--		  G_SIGNAL_RUN_LAST,
--		  0,
--		  NULL, NULL,
--		  g_cclosure_marshal_VOID__VOID,
--		  G_TYPE_NONE, 0);
--
--  /**
--   * GUnixMountMonitor::mountpoints-changed:
--   * @monitor: the object on which the signal is emitted
--   * 
--   * Emitted when the unix mount points have changed.
--   */
--  signals[MOUNTPOINTS_CHANGED] =
--    g_signal_new ("mountpoints-changed",
--		  G_TYPE_FROM_CLASS (klass),
--		  G_SIGNAL_RUN_LAST,
--		  0,
--		  NULL, NULL,
--		  g_cclosure_marshal_VOID__VOID,
--		  G_TYPE_NONE, 0);
--}
--
--static void
--g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
--{
--}
--
- /**
-  * g_unix_mount_monitor_set_rate_limit:
-  * @mount_monitor: a #GUnixMountMonitor
-@@ -1537,16 +1537,12 @@ g_unix_mount_monitor_set_rate_limit (GUn
- /**
-  * g_unix_mount_monitor_get:
-  *
-- * Gets the #GUnixMountMonitor for the current thread-default main
-- * context.
-+ * Gets the #GUnixMountMonitor.
-  *
-  * The mount monitor can be used to monitor for changes to the list of
-  * mounted filesystems as well as the list of mount points (ie: fstab
-  * entries).
-  *
-- * You must only call g_object_unref() on the return value from under
-- * the same main context as you called this function.
-- *
-  * Returns: (transfer full): the #GUnixMountMonitor.
-  *
-  * Since: 2.44
-@@ -1554,10 +1550,13 @@ g_unix_mount_monitor_set_rate_limit (GUn
- GUnixMountMonitor *
- g_unix_mount_monitor_get (void)
- {
--  return g_context_specific_group_get (&mount_monitor_group,
--                                       G_TYPE_UNIX_MOUNT_MONITOR,
--                                       G_STRUCT_OFFSET(GUnixMountMonitor, context),
--                                       mount_monitor_start);
-+  if (the_mount_monitor == NULL)
-+    {
-+      the_mount_monitor = g_object_new (G_TYPE_UNIX_MOUNT_MONITOR, NULL);
-+      return the_mount_monitor;
-+    }
-+  
-+  return g_object_ref (the_mount_monitor);
- }
- 
- /**