cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring a fix from upstream to fix a crash in gtk_style_context_get_font().

Browse Source
This commit is contained in:
ajacoutot 2013-01-07 07:28:04 +00:00
parent f7156c3c75
commit 5bf8e29a22
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gtk+3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2013/01/05 12:53:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.58 2013/01/07 07:28:04 ajacoutot Exp $
SHARED_ONLY= Yes
@ -12,6 +12,7 @@ EXTRACT_SUFX= .tar.xz
PKGNAME-main= gtk+3-${V}
PKGNAME-cups= gtk+3-cups-${V}
REVISION-main= 0
REVISION-cups= 0
# grep ^GTK_BINARY_VERSION ${WRKSRC}/Makefile (after do-configure)

45
x11/gtk+3/patches/patch-gtk_gtkstylecontext_c Normal file
View File

@ -0,0 +1,45 @@
$OpenBSD: patch-gtk_gtkstylecontext_c,v 1.1 2013/01/07 07:28:04 ajacoutot Exp $
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
--- gtk/gtkstylecontext.c.orig Thu Jan 3 23:44:36 2013
+++ gtk/gtkstylecontext.c Mon Jan 7 08:05:52 2013
@@ -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;
}