Update to 2.32.4.

Add correct OSVERSION's around the dtrace option, which doesn't yet.
Patch glib-compile-schema to silence the /foo/bar is depricated warnings that
getting spammed everytime the tool is run. It makes logs/console less readable.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16990 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 16 insertions, 45 deletions

diff --git a/devel/glib20/files/patch-gio_glib-compile-schemas.c b/devel/glib20/files/patch-gio_glib-compile-schemas.c
new file mode 100644
index 000000000..e92fac5ba
--- /dev/null
+++ b/devel/glib20/files/patch-gio_glib-compile-schemas.c
@@ -0,0 +1,16 @@
+--- gio/glib-compile-schemas.c.orig	2012-06-14 16:39:22.000000000 +0200
++++ gio/glib-compile-schemas.c	2012-06-14 16:39:55.000000000 +0200
+@@ -1204,11 +1204,13 @@
+       return;
+     }
+ 
++#if 0
+   if (path && (g_str_has_prefix (path, "/apps/") ||
+                g_str_has_prefix (path, "/desktop/") ||
+                g_str_has_prefix (path, "/system/")))
+     g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
+                 "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
++#endif
+ 
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
diff --git a/devel/glib20/files/patch-gio_gtlsinteraction.c b/devel/glib20/files/patch-gio_gtlsinteraction.c
deleted file mode 100644
index 5f1bb18d3..000000000
--- a/devel/glib20/files/patch-gio_gtlsinteraction.c
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1ae30806403e556c8297a16a25a18687d9e80f89 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 28 Jun 2012 14:41:39 +0200
-Subject: [PATCH] GTlsInteraction: Fix incorrect locking of mutex
-
- * Fix incorrect locking of mutex in g_tls_interaction_invoke_ask_password()
-
-https://bugzilla.gnome.org/show_bug.cgi?id=678758
----
- gio/gtlsinteraction.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/gio/gtlsinteraction.c b/gio/gtlsinteraction.c
-index 41574b7..e921b81 100644
---- gio/gtlsinteraction.c
-+++ gio/gtlsinteraction.c
-@@ -321,6 +321,7 @@ g_tls_interaction_invoke_ask_password (GTlsInteraction    *interaction,
-   GTlsInteractionResult result;
-   InvokeClosure *closure;
-   GTlsInteractionClass *klass;
-+  gboolean complete;
- 
-   g_return_val_if_fail (G_IS_TLS_INTERACTION (interaction), G_TLS_INTERACTION_UNHANDLED);
-   g_return_val_if_fail (G_IS_TLS_PASSWORD (password), G_TLS_INTERACTION_UNHANDLED);
-@@ -348,12 +349,16 @@ g_tls_interaction_invoke_ask_password (GTlsInteraction    *interaction,
-        */
-       if (g_main_context_acquire (interaction->priv->context))
-         {
--          while (!closure->complete)
-+          for (;;)
-             {
-+              g_mutex_lock (&closure->mutex);
-+              complete = closure->complete;
-               g_mutex_unlock (&closure->mutex);
-+              if (complete)
-+                break;
-               g_main_context_iteration (interaction->priv->context, TRUE);
--              g_mutex_lock (&closure->mutex);
-             }
-+
-           g_main_context_release (interaction->priv->context);
- 
-           if (closure->error)
--- 
-1.7.10.2