Re: fc-cache build failure & ATS [was: Re: bild failure with MKXORG=yes on OS X 10.4]

[Hubert Feyrer <hubert%feyrer.de@localhost>]

FWIW, the patch below fix the build for me. It's an ugly hack, though...


 - Hubert


--- /usr/cvs/xsrc-current/external/mit/freetype/dist/src/base/ftobjs.c.orig     
2008-07-30 04:36:14.000000000 +0200
+++ /usr/cvs/xsrc-current/external/mit/freetype/dist/src/base/ftobjs.c
@@ -1110,6 +1110,10 @@
   /* there's a Mac-specific extended implementation of FT_New_Face() */
   /* in src/base/ftmac.c                                             */

+#ifdef FT_MACINTOSH
+/* fix cross-building from Mac OS X to NetBSD - HF */
+#undef FT_MACINTOSH
+#endif
 #ifndef FT_MACINTOSH

   /* documentation is in freetype.h */

--- /usr/cvs/xsrc-current/external/mit/freetype/dist/src/base/ftbase.c.orig     
2008-09-13 14:48:14.000000000 +0200
+++ /usr/cvs/xsrc-current/external/mit/freetype/dist/src/base/ftbase.c
@@ -31,8 +31,11 @@
 #include "fttrigon.c"
 #include "ftutil.c"

+#if 0 /*HF*/
+/* fix cross-building from Mac OS X to NetBSD - HF */
 #if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
 #include "ftmac.c"
 #endif
+#endif /*HF*/

 /* END */