Update glib2 to 2.48.1

Overview of changes in GLib 2.48.1
==================================

Bugs fixed:
 731988 glocalfile: Avoid a potential NULL pointer dereference
 747107 GVariant varargs documentation: g_variant_get() example
 747478 g_system_thread_set_name() is not implemented for gthread-win32
 748474 g_get_language_names() is not thread-safe
 748530 gthread: W32 implementation of g_get_num_processors() has lame fallback
 748806 GVariant: Better introduction to the concepts and its uses
 749606 tests: always remove app.desktop
 758174 Fix documentation typos
 758738 Usage of GType properties causes crashes due to gulong/gpointer mismatch
 762994 Race condition in GIO/AppFileChooser crashes Firefox/Gtk3
 763379 codegen: Add support for g_autoptr to gdbus-codegen generated objects
 763821 build: Also dist Systemtap files always for gobject/
 764092 gstrfuncs: Document the behaviour of g_strjoinv()
 764574 build: Fix all statfs() tests failing
 764575 tests: Fix compilation errors due to Y2K format problems
 764685 GApplication documentation about handling command-line options is confusing
 764754 '-' in application id: unbreak bus activation and notifications
 765959 socket: set fd field to -1 after closing socket
 765990 Visual Studio: Define inline only when necessary

Translations updated:
 Basque language
 Catalan
 Vietnamese
 zh_CN

4 files changed, 21 insertions, 24 deletions

diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index b857c419f10..676872e470c 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2016/05/03 08:49:04 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.50 2016/05/27 08:19:27 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.48.0
+DISTNAME=	glib-2.48.1
 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 bfc25c27503..877fa40537a 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.86 2016/04/08 19:43:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.87 2016/05/27 08:19:27 prlw1 Exp $
 bin/gapplication
 bin/gdbus
 bin/gio-querymodules
@@ -290,8 +290,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.4800.0-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.4800.0-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.4800.1-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.4800.1-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib.py
@@ -518,7 +518,6 @@ 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/index.sgml
 share/gtk-doc/html/gio/left-insensitive.png
 share/gtk-doc/html/gio/left.png
 share/gtk-doc/html/gio/menu-example.png
@@ -671,7 +670,6 @@ 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/index.sgml
 share/gtk-doc/html/glib/left-insensitive.png
 share/gtk-doc/html/glib/left.png
 share/gtk-doc/html/glib/mainloop-states.gif
@@ -749,7 +747,6 @@ 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/index.sgml
 share/gtk-doc/html/gobject/left-insensitive.png
 share/gtk-doc/html/gobject/left.png
 share/gtk-doc/html/gobject/pr01.html
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index ac27befe2a5..60739303dbe 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.216 2016/04/13 10:13:43 jperkin Exp $
+$NetBSD: distinfo,v 1.217 2016/05/27 08:19:27 prlw1 Exp $
 
-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 (glib-2.48.1.tar.xz) = d59b6daf51dff21c6327734a99f1fb6c5328bcf9
+RMD160 (glib-2.48.1.tar.xz) = d201aca22d0475a1af41da84459195820ae3cb0a
+SHA512 (glib-2.48.1.tar.xz) = 5bbea7d07ba6d75c35c6be8f1ebc685aa2549bd20030741b2d6e2c30e9b2d476c2afa50a974bbdad98c305666c8b04357b51619c97fe50d3e9965700088aad9b
+Size (glib-2.48.1.tar.xz) = 7441032 bytes
 SHA1 (patch-aa) = d197ded7ca05c2e37396e6c6b185797bd9bb2821
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 6da2f31b5052a9b1d02b9a87f47896be238a88bd
 SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5
-SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
+SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
 SHA1 (patch-ak) = edf116968bd3c787fea77787add7e0164b6f1ffb
 SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
diff --git a/devel/glib2/patches/patch-aha b/devel/glib2/patches/patch-aha
index d16b8e5ea90..beb500f9b81 100644
--- a/devel/glib2/patches/patch-aha
+++ b/devel/glib2/patches/patch-aha
@@ -1,13 +1,13 @@
-$NetBSD: patch-aha,v 1.1 2012/04/30 13:53:48 drochner Exp $
+$NetBSD: patch-aha,v 1.2 2016/05/27 08:19:27 prlw1 Exp $
 
---- glib/gcharset.c.orig	2012-03-31 18:03:03.000000000 +0000
+--- glib/gcharset.c.orig	2016-05-10 08:54:30.000000000 +0000
 +++ glib/gcharset.c
-@@ -295,7 +295,7 @@ unalias_lang (char *lang)
-   int i;
+@@ -293,7 +293,7 @@ unalias_lang (char *lang)
+   if (g_once_init_enter (&alias_table))
+     {
+       GHashTable *table = g_hash_table_new (g_str_hash, g_str_equal);
+-      read_aliases ("/usr/share/locale/locale.alias", table);
++      read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias", table);
+       g_once_init_leave (&alias_table, table);
+     }
  
-   if (!alias_table)
--    read_aliases ("/usr/share/locale/locale.alias");
-+    read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias");
- 
-   i = 0;
-   while ((p = g_hash_table_lookup (alias_table, lang)) && (strcmp (p, lang) != 0))