update to 2.20.3

changes:
-bugfixes
-translation updates

4 files changed, 12 insertions, 36 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 97a1b7e4b13..f8d7498449d 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.161 2009/06/03 12:40:32 obache Exp $
+# $NetBSD: Makefile,v 1.162 2009/06/05 16:08:25 drochner Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.20.2
+DISTNAME=		glib-2.20.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.20/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 0fa823996ea..1bfa90f096c 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2009/03/15 13:32:31 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.45 2009/06/05 16:08:25 drochner Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -421,6 +421,7 @@ share/locale/bn/LC_MESSAGES/glib20.mo
 share/locale/bn_IN/LC_MESSAGES/glib20.mo
 share/locale/bs/LC_MESSAGES/glib20.mo
 share/locale/ca/LC_MESSAGES/glib20.mo
+share/locale/ca@valencia/LC_MESSAGES/glib20.mo
 share/locale/cs/LC_MESSAGES/glib20.mo
 share/locale/cy/LC_MESSAGES/glib20.mo
 share/locale/da/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index dc2044e30f8..e35a8974b2d 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.116 2009/05/26 15:42:29 wiz Exp $
+$NetBSD: distinfo,v 1.117 2009/06/05 16:08:25 drochner Exp $
 
-SHA1 (glib-2.20.2.tar.bz2) = 2c1f27bc4fb942ba93ccf934635879ffe0524f45
-RMD160 (glib-2.20.2.tar.bz2) = 5ab7863c97025bd5c1aa7659442aaee3020176ce
-Size (glib-2.20.2.tar.bz2) = 5019345 bytes
+SHA1 (glib-2.20.3.tar.bz2) = 9cc9dc579f790d87dacc21413aec6600b9eccfce
+RMD160 (glib-2.20.3.tar.bz2) = 75a1bede14759d3b7bc5ca320d2a094d242bc6dc
+Size (glib-2.20.3.tar.bz2) = 5008689 bytes
 SHA1 (patch-aa) = e8d533e6279a537fc536f61ef397165518c4bcd7
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c
 SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
 SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
-SHA1 (patch-ai) = 9880d47e9eedca4eb81b20d0bd3e4ef04ad4e679
+SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
 SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0
 SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e
 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
index 97cadd2e099..b9d421cf6f9 100644
--- a/devel/glib2/patches/patch-ai
+++ b/devel/glib2/patches/patch-ai
@@ -1,35 +1,10 @@
-$NetBSD: patch-ai,v 1.17 2009/05/20 13:07:36 wiz Exp $
+$NetBSD: patch-ai,v 1.18 2009/06/05 16:08:25 drochner Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583321
-http://bugzilla.gnome.org/show_bug.cgi?id=583324
 
---- glib/gmain.c.orig	2008-11-24 06:45:23.000000000 +0100
+--- glib/gmain.c.orig	2009-05-29 07:18:56.000000000 +0200
 +++ glib/gmain.c
-@@ -2720,13 +2720,13 @@ g_main_context_iterate (GMainContext *co
-     {
-       gboolean got_ownership;
-       
-+      LOCK_CONTEXT (context);
-+
-       g_return_val_if_fail (g_thread_supported (), FALSE);
- 
-       if (!block)
- 	return FALSE;
- 
--      LOCK_CONTEXT (context);
--      
-       if (!context->cond)
- 	context->cond = g_cond_new ();
-           
-@@ -2736,7 +2736,6 @@ g_main_context_iterate (GMainContext *co
- 
-       if (!got_ownership)
- 	{
--	  UNLOCK_CONTEXT (context);
- 	  return FALSE;
- 	}
-     }
-@@ -4039,7 +4038,11 @@ g_child_watch_source_init_multi_threaded
+@@ -3713,7 +3713,11 @@ g_child_watch_source_init_multi_threaded
   
    action.sa_handler = g_child_watch_signal_handler;
    sigemptyset (&action.sa_mask);