[45305] trunk/dports/graphics/cairo

[ryandesign at macports.org]

Revision: 45305
          http://trac.macports.org/changeset/45305
Author:   ryandesign at macports.org
Date:     2009-01-13 03:23:53 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
cairo: allow universal build with 64-bit architectures by disabling the parts that reference Carbon when compiling for 64-bit; see #16007

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

Added Paths:
-----------
    trunk/dports/graphics/cairo/files/patch-quartz-lp64.diff

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2009-01-13 11:01:53 UTC (rev 45304)
+++ trunk/dports/graphics/cairo/Portfile	2009-01-13 11:23:53 UTC (rev 45305)
@@ -40,7 +40,9 @@
     port:zlib \
     port:expat
 
-patchfiles 0137b9bd320783264d865a397392b0ee14fd69b3.patch
+patchfiles \
+    0137b9bd320783264d865a397392b0ee14fd69b3.patch \
+    patch-quartz-lp64.diff
 
 pre-configure {
     set pixman_minimum_version 0.12.0

Added: trunk/dports/graphics/cairo/files/patch-quartz-lp64.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-quartz-lp64.diff	                        (rev 0)
+++ trunk/dports/graphics/cairo/files/patch-quartz-lp64.diff	2009-01-13 11:23:53 UTC (rev 45305)
@@ -0,0 +1,29 @@
+--- src/cairo-quartz-font.c	2008-10-30 09:34:25.000000000 -0500
++++ src/cairo-quartz-font.c	2008-11-13 21:19:32.000000000 -0600
+@@ -816,6 +816,8 @@
+  *
+  * Since: 1.6
+  **/
++
++#if !__LP64__
+ cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id)
+ {
+@@ -838,3 +840,4 @@
+ {
+     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
+ }
++#endif
+--- src/cairo-quartz.h	2008-10-30 09:34:25.000000000 -0500
++++ src/cairo-quartz.h	2008-11-13 21:19:32.000000000 -0600
+@@ -66,8 +66,10 @@
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+ 
++#if !__LP64__
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
++#endif
+ 
+ #endif /* CAIRO_HAS_QUARTZ_FONT */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090113/2c91ef5b/attachment.html>