[39033] trunk/dports/graphics/cairo

[ryandesign at macports.org]

Revision: 39033
          http://trac.macosforge.org/projects/macports/changeset/39033
Author:   ryandesign at macports.org
Date:     2008-08-06 04:14:59 -0700 (Wed, 06 Aug 2008)
Log Message:
-----------
cairo: fix universal build by making the check for FcFini non-fatal; see #15451

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

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

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2008-08-06 11:09:55 UTC (rev 39032)
+++ trunk/dports/graphics/cairo/Portfile	2008-08-06 11:14:59 UTC (rev 39033)
@@ -41,6 +41,9 @@
     port:zlib \
     port:expat
 
+patchfiles \
+    patch-FcFini.diff
+
 # The +universal variant is written in such a way that the port's global
 # configure.args must not be empty!
 configure.args \

Added: trunk/dports/graphics/cairo/files/patch-FcFini.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-FcFini.diff	                        (rev 0)
+++ trunk/dports/graphics/cairo/files/patch-FcFini.diff	2008-08-06 11:14:59 UTC (rev 39033)
@@ -0,0 +1,46 @@
+--- configure	2008-04-11 16:33:44.000000000 -0500
++++ configure	2008-08-06 06:01:12.000000000 -0500
+@@ -27908,6 +27908,11 @@
+ 	FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
++	:
++fi
++
++  if test "x$use_ft" = "xyes"; then
++
+ 
+   save_cflags="$CFLAGS"
+   save_libs="$LIBS"
+@@ -28004,18 +28009,13 @@
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+-else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }; use_ft="no (requires fontconfig)"
+ fi
+ done
+ 
+   CFLAGS="$save_cflags"
+   LIBS="$save_libs"
+ 
+-fi
+ 
+-  if test "x$use_ft" = "xyes"; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for FREETYPE" >&5
+--- src/cairo-os2-surface.c	2008-04-04 17:45:22.000000000 -0500
++++ src/cairo-os2-surface.c	2008-08-06 06:01:12.000000000 -0500
+@@ -145,8 +145,10 @@
+     CAIRO_MUTEX_FINALIZE ();
+ 
+ #if CAIRO_HAS_FT_FONT
++# if HAVE_FCFINI
+     /* Uninitialize FontConfig */
+     FcFini ();
++# endif
+ #endif
+ 
+ #ifdef __WATCOMC__
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080806/7413790b/attachment.html