Changes 2.34.2:

* Bug fixes:
 649302 Add support for GNU/FreeBSD
 672924 Add annotations for g_filename_from_uri()
 685995 Crash in g_menu_exporter_name_vanished
 686091 Invalid reads in g_bytes_unref_to_data
 686185 g_date_time_format Transcoding Fails on OSX
 686213 Half open TCP sockets remain open after soup...
 686662 introduce explicitly-sized enum types, depre...
 686786 g_socket_get_available_bytes() returns wrong...
 687089 g_dbus_connection_export_menu_model(): fix a...
 687540 In Trash folder, Nautilus misinterprets "\n"...
 687541 GSignalQuery param_types field needs array a...
 687600 gfileutils.c performs invalid cast of (varar...
 687801 tests/buffered-input-stream: Fix size of par...

7 files changed, 30 insertions, 21 deletions

diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
index fee2d9f6abb..7fb2c520d0f 100644
--- a/devel/glib2/patches/patch-af
+++ b/devel/glib2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.13 2012/05/01 18:45:52 adam Exp $
+$NetBSD: patch-af,v 1.14 2012/11/13 21:23:07 adam Exp $
 
 --- glib/libcharset/Makefile.in.orig	2010-09-27 16:10:13.000000000 +0000
 +++ glib/libcharset/Makefile.in
-@@ -728,18 +728,6 @@ lcov-clean:
+@@ -776,18 +776,6 @@ lcov-clean:
  # run tests in cwd as part of make check
  check-local: test-nonrecursive
  install-exec-local: all-local
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
index ec21b2089ad..3726ef0f961 100644
--- a/devel/glib2/patches/patch-ai
+++ b/devel/glib2/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.20 2012/05/01 18:45:52 adam Exp $
+$NetBSD: patch-ai,v 1.21 2012/11/13 21:23:07 adam Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583321
 
 --- glib/gmain.c.orig	2011-10-14 04:03:10.000000000 +0000
 +++ glib/gmain.c
-@@ -4393,7 +4393,11 @@ ensure_unix_signal_handler_installed_unl
+@@ -4538,7 +4538,11 @@ ensure_unix_signal_handler_installed_unl
  
    action.sa_handler = g_unix_signal_handler;
    sigemptyset (&action.sa_mask);
diff --git a/devel/glib2/patches/patch-am b/devel/glib2/patches/patch-am
index 556a1c7475c..ae24e2e5b56 100644
--- a/devel/glib2/patches/patch-am
+++ b/devel/glib2/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.8 2012/10/06 20:44:05 prlw1 Exp $
+$NetBSD: patch-am,v 1.9 2012/11/13 21:23:07 adam Exp $
 
 --- gio/tests/converter-stream.c.orig	2012-09-03 14:24:05.000000000 +0000
 +++ gio/tests/converter-stream.c
-@@ -1167,7 +1167,9 @@ main (int   argc,
+@@ -1173,7 +1173,9 @@ main (int   argc,
    CharsetTest charset_tests[] = {
      { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
      { "/converter-input-stream/charset/latin1->utf8", "ISO-8859-1", "\305rr Sant\351", "UTF-8", "\303\205rr Sant\303\251", 0 },
diff --git a/devel/glib2/patches/patch-ap b/devel/glib2/patches/patch-ap
index c0385cb97c0..557212c2acb 100644
--- a/devel/glib2/patches/patch-ap
+++ b/devel/glib2/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
+$NetBSD: patch-ap,v 1.4 2012/11/13 21:23:07 adam Exp $
 
---- gio/gcredentials.c.orig	Tue Aug 16 00:51:06 2011
+--- gio/gcredentials.c.orig	2012-11-10 03:18:53.000000000 +0000
 +++ gio/gcredentials.c
 @@ -32,6 +32,9 @@
  #include <sys/socket.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
  #include <gobject/gvaluecollector.h>
 @@ -90,8 +93,14 @@ struct _GCredentials
    struct ucred native;
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
    struct cmsgcred native;
 -#elif defined(__OpenBSD__)
 +#elif defined(__OpenBSD__) && !defined(__MirBSD__)
@@ -54,7 +54,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
 +#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    if (credentials->native.uid == other_credentials->native.uid)
      ret = TRUE;
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 @@ -305,7 +314,7 @@ g_credentials_get_native (GCredentials  
  
    ret = NULL;
@@ -80,7 +80,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
 -      memcpy (&credentials->native, native, sizeof (struct ucred));
 +      memcpy (&credentials->native, native, sizeof (credentials->native));
      }
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
    if (native_type != G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED)
 @@ -433,7 +442,7 @@ g_credentials_get_unix_user (GCredential
    g_return_val_if_fail (G_IS_CREDENTIALS (credentials), -1);
@@ -89,7 +89,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
 -#ifdef __linux__
 +#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    ret = credentials->native.uid;
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
    ret = credentials->native.cmcred_euid;
 @@ -479,7 +488,7 @@ g_credentials_set_unix_user (GCredential
    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -99,4 +99,4 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
 +#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    credentials->native.uid = uid;
    ret = TRUE;
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff --git a/devel/glib2/patches/patch-aq b/devel/glib2/patches/patch-aq
index c680a98da74..6477b184582 100644
--- a/devel/glib2/patches/patch-aq
+++ b/devel/glib2/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
+$NetBSD: patch-aq,v 1.5 2012/11/13 21:23:07 adam Exp $
 
---- gio/gsocket.c.orig	2012-05-01 00:06:39.000000000 +0000
+--- gio/gsocket.c.orig	2012-11-10 03:27:29.000000000 +0000
 +++ gio/gsocket.c
 @@ -37,6 +37,9 @@
  #include <signal.h>
@@ -12,7 +12,16 @@ $NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
  
  #ifndef G_OS_WIN32
  # include <fcntl.h>
-@@ -4301,7 +4304,7 @@ g_socket_get_credentials (GSocket   *soc
+@@ -2381,7 +2384,7 @@ g_socket_check_connect_result (GSocket  
+ gssize
+ g_socket_get_available_bytes (GSocket *socket)
+ {
+-#ifndef G_OS_WIN32
++#ifdef G_OS_WIN32
+   gulong avail = 0;
+ #else
+   gint avail = 0;
+@@ -4311,7 +4314,7 @@ g_socket_get_credentials (GSocket   *soc
  
    ret = NULL;
  
@@ -21,7 +30,7 @@ $NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
    {
      socklen_t optlen;
  #if defined(__linux__)
-@@ -4336,6 +4339,35 @@ g_socket_get_credentials (GSocket   *soc
+@@ -4346,6 +4349,35 @@ g_socket_get_credentials (GSocket   *soc
                                    &native_creds);
        }
    }
diff --git a/devel/glib2/patches/patch-cl b/devel/glib2/patches/patch-cl
index f1476d0ec05..acebe66dbce 100644
--- a/devel/glib2/patches/patch-cl
+++ b/devel/glib2/patches/patch-cl
@@ -1,4 +1,4 @@
-$NetBSD: patch-cl,v 1.8 2012/07/24 18:23:38 drochner Exp $
+$NetBSD: patch-cl,v 1.9 2012/11/13 21:23:07 adam Exp $
 
 --- gio/Makefile.am.orig	2012-07-14 20:33:13.000000000 +0000
 +++ gio/Makefile.am
@@ -11,7 +11,7 @@ $NetBSD: patch-cl,v 1.8 2012/07/24 18:23:38 drochner Exp $
  
  if OS_UNIX
  SUBDIRS += xdgmime
-@@ -715,13 +715,6 @@ gdbus_LDADD = libgio-2.0.la \
+@@ -722,13 +722,6 @@ gdbus_LDADD = libgio-2.0.la \
  	$(top_builddir)/glib/libglib-2.0.la 		\
  	$(top_builddir)/gobject/libgobject-2.0.la
  
diff --git a/devel/glib2/patches/patch-cn b/devel/glib2/patches/patch-cn
index 7de8199ff3b..21c0975e4a4 100644
--- a/devel/glib2/patches/patch-cn
+++ b/devel/glib2/patches/patch-cn
@@ -1,4 +1,4 @@
-$NetBSD: patch-cn,v 1.2 2012/05/01 18:45:53 adam Exp $
+$NetBSD: patch-cn,v 1.3 2012/11/13 21:23:07 adam 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
@@ -7,7 +7,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
 
 --- glib/tests/Makefile.am.orig	2011-06-05 23:18:49.000000000 +0000
 +++ glib/tests/Makefile.am
-@@ -76,9 +76,6 @@ hostutils_LDADD     = $(progs_ldadd)
+@@ -77,9 +77,6 @@ hostutils_LDADD     = $(progs_ldadd)
  TEST_PROGS         += gvariant
  gvariant_LDADD      = $(progs_ldadd)