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

Make sure g_type_init is called; it is mandatory in our version of glib.

Browse Source 
This should fix dot(1)/doxygen hangs that several reported.

ok sthen@
This commit is contained in:
ajacoutot 2013-03-21 17:52:41 +00:00
parent 4cfc94d8a4
commit 66becbb597
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/pango/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.77 2013/03/11 10:50:24 espie Exp $
# $OpenBSD: Makefile,v 1.78 2013/03/21 17:52:41 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= library for layout and rendering of text
GNOME_VERSION= 1.32.6
GNOME_PROJECT= pango
REVISION= 0
REVISION= 1
SHARED_LIBS += pango-1.0 3200.1 # 3200.6
SHARED_LIBS += pangoft2-1.0 3200.1 # 3200.6

31
devel/pango/patches/patch-pango_pangocairo-fontmap_c Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-pango_pangocairo-fontmap_c,v 1.1 2013/03/21 17:52:41 ajacoutot Exp $
From 71006c534a5599f0a69f4bd9b6677b2a6ad5adb3 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 15 Mar 2013 10:03:52 +0000
Subject: Call g_type_init if necessary
--- pango/pangocairo-fontmap.c.orig Mon Jan 7 20:07:35 2013
+++ pango/pangocairo-fontmap.c Thu Mar 21 18:48:50 2013
@@ -66,6 +66,10 @@ pango_cairo_font_map_default_init (PangoCairoFontMapIf
PangoFontMap *
pango_cairo_font_map_new (void)
{
+#if !GLIB_CHECK_VERSION (2, 35, 3)
+ /* Make sure that the type system is initialized */
+ g_type_init ();
+#endif
#if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ)
return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL);
#elif defined(HAVE_CAIRO_WIN32)
@@ -99,6 +103,10 @@ pango_cairo_font_map_new (void)
PangoFontMap *
pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype)
{
+#if !GLIB_CHECK_VERSION (2, 35, 3)
+ /* Make sure that the type system is initialized */
+ g_type_init ();
+#endif
switch ((int) fonttype)
{
#if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ)