[44129] trunk/dports/graphics/cairo

[jeremyhu at macports.org]

Revision: 44129
          http://trac.macports.org/changeset/44129
Author:   jeremyhu at macports.org
Date:     2008-12-22 00:45:30 -0800 (Mon, 22 Dec 2008)
Log Message:
-----------
cairo: Don't call FT_Done_Face() on faces we did not create

Modified Paths:
--------------
    trunk/dports/graphics/cairo/Portfile

Added Paths:
-----------
    trunk/dports/graphics/cairo/files/0137b9bd320783264d865a397392b0ee14fd69b3.patch

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2008-12-22 08:04:33 UTC (rev 44128)
+++ trunk/dports/graphics/cairo/Portfile	2008-12-22 08:45:30 UTC (rev 44129)
@@ -5,6 +5,7 @@
 name                    cairo
 set my_name             cairo
 version                 1.8.6
+revision                1
 categories              graphics
 maintainers             ryandesign
 homepage                http://cairographics.org/
@@ -39,6 +40,8 @@
     port:zlib \
     port:expat
 
+patchfiles 0137b9bd320783264d865a397392b0ee14fd69b3.patch
+
 pre-configure {
     set pixman_minimum_version 0.12.0
     set pixman_installed_version [exec pkg-config pixman-1 --modversion]

Added: trunk/dports/graphics/cairo/files/0137b9bd320783264d865a397392b0ee14fd69b3.patch
===================================================================
--- trunk/dports/graphics/cairo/files/0137b9bd320783264d865a397392b0ee14fd69b3.patch	                        (rev 0)
+++ trunk/dports/graphics/cairo/files/0137b9bd320783264d865a397392b0ee14fd69b3.patch	2008-12-22 08:45:30 UTC (rev 44129)
@@ -0,0 +1,21 @@
+From 0137b9bd320783264d865a397392b0ee14fd69b3 Mon Sep 17 00:00:00 2001
+From: Karl Tomlinson<karlt+ at karlt.net>
+Date: Wed, 17  Dec  2008  21:40:12  +0000
+Subject: [ft] Don't call FT_Done_Face() on faces we did not create
+
+---
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index cd11253..3675db6 100644
+--- src/cairo-ft-font.c
++++ src/cairo-ft-font.c
+@@ -528,7 +528,7 @@ _has_unlocked_face (void *entry)
+ {
+     cairo_ft_unscaled_font_t *unscaled = entry;
+ 
+-    return (unscaled->lock_count == 0 && unscaled->face);
++    return (!unscaled->from_face && unscaled->lock_count == 0 && unscaled->face);
+ }
+ 
+ /* Ensures that an unscaled font has a face object. If we exceed
+--
+cgit v0.8.1-24-ge5fb
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081222/cf8f4f26/attachment.html>