Update to 2.36.3:

Overview of changes fron GLib 2.36.2 to 2.36.3
==============================================

* Bug fixes:
 692848 Fix property example in gobject tutorial
 696857 GThreadedResolver: set an error if no records could be found
 697849 spelling fixes of 'runtine' and 'adresses' in cross.xml a...
 699779 G_GNUC_FORMAT: documentation error
 699959 g_file_copy(): Ensure we create private files by default
 701560 various improvements for g_file_set_contents()
 701680 GFileEnumerator: Add some documentation about ordering

* Translation updates:
 Kannada

5 files changed, 26 insertions, 26 deletions

diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index ffc38769eff..95daeff5bc0 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2013/05/31 22:53:23 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.30 2013/06/14 21:04:03 wiz 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.36.2
+DISTNAME=	glib-2.36.3
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 CATEGORIES=	# empty; redefined in Makefile
 MASTER_SITES=	ftp://ftp.gtk.org/pub/glib/${PKGVERSION_NOREV:R}/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 6c2d4db1f96..faa187607d7 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.75 2013/05/31 22:53:23 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.76 2013/06/14 21:04:03 wiz Exp $
 bin/gdbus
 bin/gio-querymodules
 bin/glib-compile-resources
@@ -274,8 +274,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.3600.2-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.3600.2-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.3600.3-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.3600.3-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 0a73f1acf02..56c85fe6237 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.186 2013/05/31 22:53:23 prlw1 Exp $
+$NetBSD: distinfo,v 1.187 2013/06/14 21:04:03 wiz Exp $
 
-SHA1 (glib-2.36.2.tar.xz) = df62f1162adde4d75c4f2f34495e2361275ac7cc
-RMD160 (glib-2.36.2.tar.xz) = 3a409e1adbad0dc8e57a2396d207e16a7978b3fd
-Size (glib-2.36.2.tar.xz) = 6615452 bytes
+SHA1 (glib-2.36.3.tar.xz) = aafba69934b9ba77cc8cb0e5d8105aa1d8463eba
+RMD160 (glib-2.36.3.tar.xz) = 2db71aacc028a6d39ec5fdeacf326b7a19e8bb28
+Size (glib-2.36.3.tar.xz) = 6626972 bytes
 SHA1 (patch-aa) = 71405ed89d2abd25edec375d52c43fe50c9f7c82
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -22,7 +22,7 @@ SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
 SHA1 (patch-cd) = 312e2f322b295ddec613f9ce9760ecafeab69047
 SHA1 (patch-ce) = ab978e9acfbfcd4e1249cbc2f9ab7e503d62a53f
-SHA1 (patch-cj) = 916a4b4a24b7bf4c07b99845fc4e6ec5de82350f
+SHA1 (patch-cj) = 6e5fa171080b45372af9c95ab0abfde5e90fdf57
 SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
 SHA1 (patch-cl) = eb00468c5c5c70dd41803a2a263204686959a415
 SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
@@ -30,6 +30,6 @@ SHA1 (patch-cn) = ca3140375cb82ad9ef93d6157e04e40a593c36cd
 SHA1 (patch-gio_gcontenttype.c) = 72f0e1b2911df5997e15ef428706c3ba6b62dd83
 SHA1 (patch-gio_glocalfile.c) = 2087b54b187ae8812897f3ca9e893e542a5dd414
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
-SHA1 (patch-gio_gthreadedresolver.c) = 18534f886363ba0b64b744277599f8e961c5d2b5
+SHA1 (patch-gio_gthreadedresolver.c) = 7626d08da36e52d9997ec33453fba5c4efdaf57e
 SHA1 (patch-glib_gmarkup.c) = 238cce5f20d2fd9a12832d47d498edfd7290075b
 SHA1 (patch-glib_gstrfuncs.c) = 6719b83e35e1f4e4e8b1c113faa8596676fd9ae5
diff --git a/devel/glib2/patches/patch-cj b/devel/glib2/patches/patch-cj
index f1c3eaac417..b5e46f633f2 100644
--- a/devel/glib2/patches/patch-cj
+++ b/devel/glib2/patches/patch-cj
@@ -1,13 +1,13 @@
-$NetBSD: patch-cj,v 1.9 2013/04/19 22:21:41 prlw1 Exp $
+$NetBSD: patch-cj,v 1.10 2013/06/14 21:04:03 wiz Exp $
 
 The mem-overflow test contains a declaration of an empty struct, which breaks
 on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
 test for now, pending a better fix.
 https://bugzilla.gnome.org/show_bug.cgi?id=641350
 
---- glib/tests/Makefile.in.orig	2013-03-25 21:07:18.000000000 +0000
+--- glib/tests/Makefile.in.orig	2013-06-09 22:53:46.000000000 +0000
 +++ glib/tests/Makefile.in
-@@ -91,7 +91,7 @@ am__EXEEXT_3 = array-test$(EXEEXT) async
+@@ -119,7 +119,7 @@ am__EXEEXT_3 = array-test$(EXEEXT) async
  	keyfile$(EXEEXT) list$(EXEEXT) logging$(EXEEXT) \
  	mainloop$(EXEEXT) mappedfile$(EXEEXT) markup-parse$(EXEEXT) \
  	markup-collect$(EXEEXT) markup-escape$(EXEEXT) \
@@ -16,7 +16,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	node$(EXEEXT) once$(EXEEXT) option-context$(EXEEXT) \
  	option-argv0$(EXEEXT) pattern$(EXEEXT) private$(EXEEXT) \
  	protocol$(EXEEXT) queue$(EXEEXT) rand$(EXEEXT) \
-@@ -287,10 +287,6 @@ markup_subparser_SOURCES = markup-subpar
+@@ -315,10 +315,6 @@ markup_subparser_SOURCES = markup-subpar
  markup_subparser_OBJECTS = markup-subparser.$(OBJEXT)
  markup_subparser_LDADD = $(LDADD)
  markup_subparser_DEPENDENCIES = $(top_builddir)/glib/libglib-2.0.la
@@ -27,7 +27,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  mutex_SOURCES = mutex.c
  mutex_OBJECTS = mutex.$(OBJEXT)
  mutex_LDADD = $(LDADD)
-@@ -485,7 +481,7 @@ SOURCES = $(1bit_emufutex_SOURCES) 1bit-
+@@ -513,7 +509,7 @@ SOURCES = $(1bit_emufutex_SOURCES) 1bit-
  	$(gwakeup_SOURCES) $(gwakeup_fallback_SOURCES) hash.c hmac.c \
  	hook.c hostutils.c include.c keyfile.c list.c logging.c \
  	mainloop.c mappedfile.c markup-collect.c markup-escape.c \
@@ -36,7 +36,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	node.c once.c option-argv0.c option-context.c pattern.c \
  	private.c protocol.c queue.c rand.c rec-mutex.c regex.c \
  	rwlock.c scannerapi.c sequence.c shell.c slice.c slist.c \
-@@ -501,7 +497,7 @@ DIST_SOURCES = $(1bit_emufutex_SOURCES) 
+@@ -529,7 +525,7 @@ DIST_SOURCES = $(1bit_emufutex_SOURCES) 
  	$(gwakeup_SOURCES) $(am__gwakeup_fallback_SOURCES_DIST) hash.c \
  	hmac.c hook.c hostutils.c include.c keyfile.c list.c logging.c \
  	mainloop.c mappedfile.c markup-collect.c markup-escape.c \
@@ -45,7 +45,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	node.c once.c option-argv0.c option-context.c pattern.c \
  	private.c protocol.c queue.c rand.c rec-mutex.c regex.c \
  	rwlock.c scannerapi.c sequence.c shell.c slice.c slist.c \
-@@ -770,7 +766,7 @@ TEST_PROGS = array-test asyncqueue atomi
+@@ -815,7 +811,7 @@ TEST_PROGS = array-test asyncqueue atomi
  	environment error fileutils gdatetime gvariant gwakeup hash \
  	hmac hook hostutils keyfile list logging mainloop mappedfile \
  	markup-parse markup-collect markup-escape markup-subparser \
@@ -54,18 +54,18 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
  	pattern private protocol queue rand rec-mutex regex rwlock \
  	scannerapi sequence shell slice slist sort spawn-multithreaded \
  	spawn-singlethread strfuncs string testing test-printf thread \
-@@ -965,9 +961,7 @@ markup-parse$(EXEEXT): $(markup_parse_OB
- markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES) $(EXTRA_markup_subparser_DEPENDENCIES) 
+@@ -1051,9 +1047,7 @@ markup-subparser$(EXEEXT): $(markup_subp
  	@rm -f markup-subparser$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
+ 
 -mem-overflow$(EXEEXT): $(mem_overflow_OBJECTS) $(mem_overflow_DEPENDENCIES) $(EXTRA_mem_overflow_DEPENDENCIES) 
 -	@rm -f mem-overflow$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(mem_overflow_OBJECTS) $(mem_overflow_LDADD) $(LIBS)
 +
+ 
  mutex$(EXEEXT): $(mutex_OBJECTS) $(mutex_DEPENDENCIES) $(EXTRA_mutex_DEPENDENCIES) 
  	@rm -f mutex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(mutex_OBJECTS) $(mutex_LDADD) $(LIBS)
-@@ -1128,7 +1122,6 @@ distclean-compile:
+@@ -1251,7 +1245,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-escape.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-parse.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-subparser.Po@am__quote@
diff --git a/devel/glib2/patches/patch-gio_gthreadedresolver.c b/devel/glib2/patches/patch-gio_gthreadedresolver.c
index ba6d1c8d7a0..e881135e23d 100644
--- a/devel/glib2/patches/patch-gio_gthreadedresolver.c
+++ b/devel/glib2/patches/patch-gio_gthreadedresolver.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-gio_gthreadedresolver.c,v 1.1 2013/04/25 12:10:48 joerg Exp $
+$NetBSD: patch-gio_gthreadedresolver.c,v 1.2 2013/06/14 21:04:03 wiz Exp $
 
---- gio/gthreadedresolver.c.orig	2013-04-23 20:38:28.000000000 +0000
+--- gio/gthreadedresolver.c.orig	2013-06-09 22:07:09.000000000 +0000
 +++ gio/gthreadedresolver.c
 @@ -369,6 +369,8 @@ g_resolver_record_type_to_rrtype (GResol
    g_return_val_if_reached (-1);
@@ -11,8 +11,8 @@ $NetBSD: patch-gio_gthreadedresolver.c,v 1.1 2013/04/25 12:10:48 joerg Exp $
  static GList *
  g_resolver_records_from_res_query (const gchar      *rrname,
                                     gint              rrtype,
-@@ -474,6 +476,7 @@ g_resolver_records_from_res_query (const
- 
+@@ -482,6 +484,7 @@ g_resolver_records_from_res_query (const
+   else
      return records;
  }
 +#pragma GCC diagnostic pop