diff options
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-bug691186 | 57 |
3 files changed, 5 insertions, 62 deletions
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 5c00db456..2aed5db2c 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,10 +1,10 @@ # Created by: Vanilla I. Shu <vanilla@MinJe.com.TW> # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.51 2013/01/04 19:37:00 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.52 2013/01/07 10:14:43 kwm Exp $ PORTNAME= gtk -PORTVERSION= 3.6.3 -PORTREVISION?= 1 +PORTVERSION= 3.6.4 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index bed2c08e4..ce56379d4 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtk+-3.6.3.tar.xz) = da376bc0623650b1560c844d94dc3bc259edb7cac14ebab1ba3325b566213801 -SIZE (gnome3/gtk+-3.6.3.tar.xz) = 13274804 +SHA256 (gnome3/gtk+-3.6.4.tar.xz) = dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1 +SIZE (gnome3/gtk+-3.6.4.tar.xz) = 13275488 diff --git a/x11-toolkits/gtk30/files/patch-bug691186 b/x11-toolkits/gtk30/files/patch-bug691186 deleted file mode 100644 index 17c41ed48..000000000 --- a/x11-toolkits/gtk30/files/patch-bug691186 +++ /dev/null @@ -1,57 +0,0 @@ -From 7f0b30d7d40acaaaa2ecda603903c00544232bb8 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte <otte@redhat.com> -Date: Sun, 06 Jan 2013 22:08:28 +0000 -Subject: stylecontext: Make font hack not crash - -It's a lot uglier now, but it shouldn't crash anymore. - -We must update the font description for animations, but we can't free it -on query, because some paths call gtk_style_context_get_font() twice in -a row without stopping the use of the first call. So us just creating a -new font description all the time and unreffing the old one is not a -good idea. So we just mere the new one into the old one. - -https://bugzilla.gnome.org/show_bug.cgi?id=691186 ---- -diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c -index bcbea77..f081361 100644 ---- a/gtk/gtkstylecontext.c -+++ b/gtk/gtkstylecontext.c -@@ -3508,7 +3508,7 @@ gtk_style_context_get_font (GtkStyleContext *context, - { - GtkStyleContextPrivate *priv; - StyleData *data; -- PangoFontDescription *description; -+ PangoFontDescription *description, *previous; - - g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL); - -@@ -3520,10 +3520,22 @@ gtk_style_context_get_font (GtkStyleContext *context, - /* Yuck, fonts are created on-demand but we don't return a ref. - * Do bad things to achieve this requirement */ - gtk_style_context_get (context, state, "font", &description, NULL); -- g_object_set_data_full (G_OBJECT (data->store), -- "font-cache-for-get_font", -- description, -- (GDestroyNotify) pango_font_description_free); -+ -+ previous = g_object_get_data (G_OBJECT (data->store), "font-cache-for-get_font"); -+ -+ if (previous) -+ { -+ pango_font_description_merge (previous, description, TRUE); -+ pango_font_description_free (description); -+ description = previous; -+ } -+ else -+ { -+ g_object_set_data_full (G_OBJECT (data->store), -+ "font-cache-for-get_font", -+ description, -+ (GDestroyNotify) pango_font_description_free); -+ } - - return description; - } --- -cgit v0.9.0.2 |