Public SourceMage Discussion List

[Eric Sandall <eric AT sandall.us>]

On Fri, 17 Dec 2004, Eric Sandall wrote:
> Hi all,
>
> I know some of you have been hit by the "bug" where packages do not
> properly include freetype.h, and so it fails on line 20 of
> /usr/include/freetype2/freetype/freetype.h, which says to have the
> program use:
>  #include <ft2build.h>
>  #include FT_FREETYPE_H
>
> I'd like to know if we should patch all the spells individually to
> properly include ft2build.h at the proper time or if we should modify
> freetype2 to just include ft2build.h at that point. I'm for the
> latter, which I've modified my headers to do for a while and it seems
> to work, as that would be less work, though perhaps not the "proper"
> fix.
>
> What do others think?

And here's my proposed patch to apply in freetype2/PRE_BUILD that
fixes this. It turns the #errors into #warnings and includes
ft2build.h and FT_FREETYPE_H if they're not already.

-sandalle

--
Eric Sandall                     |  Source Mage GNU/Linux Developer
eric AT sandall.us                  |  http://www.sourcemage.org/
http://eric.sandall.us/          |  SysAdmin @ Inst. Shock Physics @ WSU
http://counter.li.org/  #196285  |  http://www.shock.wsu.edu/diff -Naur freetype-2.1.9.orig/include/freetype/freetype.h 
freetype-2.1.9/include/freetype/freetype.h
--- freetype-2.1.9.orig/include/freetype/freetype.h     2004-12-16 
16:50:34.793571936 -0800
+++ freetype-2.1.9/include/freetype/freetype.h  2004-12-16 16:52:22.060264920 
-0800
@@ -16,12 +16,16 @@
 /***************************************************************************/
 
 
+
 #ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error "  #include <ft2build.h>"
-#error "  #include FT_FREETYPE_H"
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#warning "`ft2build.h' hasn't been included yet!"
+#warning "Please always use macros to include FreeType header files."
+#warning "Example:"
+#warning "  #include <ft2build.h>"
+#warning "  #include FT_FREETYPE_H"
+#warning "Source Mage has included this for you, but please fix it"
 #endif