Update glib2 to 2.42.1

Overview of changes in GLib 2.42.1
==================================

* This release disables deprecation warnings by default

* Bugs fixed:
 728256 gcredentials: add NetBSD support (no more patch-gio_gioenums.h)
 736806 gtask: Fix reference count loop causing leaks
 737143 Include <stdint.h> in glib/valgrind.h
 738170 g_byte_array_new_take() doesn't initialize array->alloc
 738197 g_cond_timed_wait() doesn't time out on Mac OS X

* Translation updates:
 Bengali (India)
 Bulgarian
 Gujarati
 Italian
 Norwegian bokmål
 Telugu

4 files changed, 9 insertions, 40 deletions

diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 7155393d8bb..ce9194e2345 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2014/10/09 14:06:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.43 2014/11/29 17:55:07 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.42.0
+DISTNAME=	glib-2.42.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 3e65b025151..65c3cbe2fe4 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.81 2014/10/07 23:18:36 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.82 2014/11/29 17:55:07 prlw1 Exp $
 bin/gapplication
 bin/gdbus
 bin/gio-querymodules
@@ -280,8 +280,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/libglib-2.0.so.0.4200.0-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.4200.0-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.4200.1-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.4200.1-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/po/Makefile.in.in
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 98322653be2..b7b10081ddb 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.205 2014/10/07 23:18:36 prlw1 Exp $
+$NetBSD: distinfo,v 1.206 2014/11/29 17:55:07 prlw1 Exp $
 
-SHA1 (glib-2.42.0.tar.xz) = f5168a7adffad3620ff3f1b3d6ff6d0ad3f0752e
-RMD160 (glib-2.42.0.tar.xz) = 3d2434ee1d1e68d39ddb27cbfee025fcb4e0197e
-Size (glib-2.42.0.tar.xz) = 7062896 bytes
+SHA1 (glib-2.42.1.tar.xz) = b5158fd434f01e84259155c04ff93026a090e586
+RMD160 (glib-2.42.1.tar.xz) = 1c2079f5242b5133d345fba9bc9b846c4a46c5cc
+Size (glib-2.42.1.tar.xz) = 6985120 bytes
 SHA1 (patch-aa) = 03313c0ee430a127c07510b096c5d1556c8db74e
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -22,7 +22,6 @@ SHA1 (patch-cl) = 871e1ca59f697eddd6692702fc7d63a2df826afc
 SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
 SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78
 SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
-SHA1 (patch-gio_gioenums.h) = 308df812fdb2d19be73ea641faa7b920e2fdc2a5
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
 SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
 SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
diff --git a/devel/glib2/patches/patch-gio_gioenums.h b/devel/glib2/patches/patch-gio_gioenums.h
deleted file mode 100644
index 6cdad2fcde5..00000000000
--- a/devel/glib2/patches/patch-gio_gioenums.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-gio_gioenums.h,v 1.3 2014/10/07 23:18:36 prlw1 Exp $
-
-Revert unintentional change to enum values
-https://bugzilla.gnome.org/show_bug.cgi?id=728256
-
---- gio/gioenums.h.orig	2014-09-22 13:42:12.000000000 +0000
-+++ gio/gioenums.h
-@@ -1364,9 +1364,9 @@ typedef enum
-  * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
-  * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
-  * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
-- * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
-  * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
-  * @G_CREDENTIALS_TYPE_SOLARIS_UCRED: The native credentials type is a <type>ucred_t</type>. Added in 2.40.
-+ * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
-  *
-  * Enumeration describing different kinds of native credential types.
-  *
-@@ -1377,9 +1377,9 @@ typedef enum
-   G_CREDENTIALS_TYPE_INVALID,
-   G_CREDENTIALS_TYPE_LINUX_UCRED,
-   G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
--  G_CREDENTIALS_TYPE_NETBSD_UNPCBID,
-   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
--  G_CREDENTIALS_TYPE_SOLARIS_UCRED
-+  G_CREDENTIALS_TYPE_SOLARIS_UCRED,
-+  G_CREDENTIALS_TYPE_NETBSD_UNPCBID
- } GCredentialsType;
- 
- /**