diff options
Diffstat (limited to 'devel/glib20')
| -rw-r--r-- | devel/glib20/Makefile | 15 | ||||
| -rw-r--r-- | devel/glib20/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib20/files/patch-gio_glib-compile-schemas.c | 16 | ||||
| -rw-r--r-- | devel/glib20/files/patch-gio_gtlsinteraction.c | 45 | ||||
| -rw-r--r-- | devel/glib20/pkg-plist | 9 |
5 files changed, 32 insertions, 57 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 4fd291dd2..92391cc44 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,13 +3,13 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.223 2012/05/27 15:16:28 kwm Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.224 2012/06/28 13:51:28 marcus Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib -PORTVERSION= 2.32.3 -PORTREVISION?= 3 +PORTVERSION= 2.32.4 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -57,10 +57,13 @@ OPTIONS= COLLATION_FIX "fix string collation" off .include <bsd.port.pre.mk> -#.if ${OSVERSION} >= 900000 -#CONFIGURE_ARGS+=--enable-dtrace -#.else +# doesn't build yet +#.if (${OSVERSION} < 800000) \ +# || (${OSVERSION} >= 800000 && ${OSVERSION} < 802000) +# || (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) CONFIGURE_ARGS+=--disable-dtrace +#.else +#CONFIGURE_ARGS+=--enable-dtrace #.endif .if ${ARCH} == powerpc64 diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 164ffcd44..129eca31c 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-2.32.3.tar.xz) = b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d -SIZE (gnome2/glib-2.32.3.tar.xz) = 6164984 +SHA256 (gnome2/glib-2.32.4.tar.xz) = a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 +SIZE (gnome2/glib-2.32.4.tar.xz) = 6178556 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 diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index e5491ac6e..2684f6822 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -11,9 +11,9 @@ bin/gresource bin/gsettings bin/gtester bin/gtester-report -etc/bash_completion.d/gdbus-bash-completion.sh -etc/bash_completion.d/gresource-bash-completion.sh -etc/bash_completion.d/gsettings-bash-completion.sh +share/bash-completion/completions/gdbus +share/bash-completion/completions/gsettings +share/bash-completion/completions/gresource include/gio-unix-2.0/gio/gdesktopappinfo.h include/gio-unix-2.0/gio/gfiledescriptorbased.h include/gio-unix-2.0/gio/gunixconnection.h @@ -468,6 +468,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm share/glib-2.0/gettext/po @dirrm share/glib-2.0/gettext @dirrm share/glib-2.0 +@dirrmtry share/bash-completion/completions +@dirrmtry share/bash-completion @exec mkdir -p %D/share/GConf/gsettings @dirrm share/GConf/gsettings @dirrm share/GConf @@ -484,4 +486,3 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm include/glib-2.0 @dirrm include/gio-unix-2.0/gio @dirrm include/gio-unix-2.0 -@dirrmtry etc/bash_completion.d |