On Fri, 23 Jan 2004, Daniel Mueller wrote:
On Fri, 23 Jan 2004 15:18:05 +0100 (CET) Per Liden <per@fukt.bth.se> wrote:
I wouldn't mind going back to freetype 2.1.5 again to resolve this mess.
Comments?
------------snip------------- --- /usr/include/freetype2/freetype/freetype.h.orig 2004-01-23 22:57:02.390297736 +0100+++ /usr/include/freetype2/freetype/freetype.h 2004-01-23 22:58:43.289958656 +0100@@ -17,13 +17,12 @@
#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" +#ifndef FT_FREETYPE_H_OBSOLETE +#define FT_FREETYPE_H_OBSOLETE +#include <ft2build.h> +#include FT_FREETYPE_H +#endif #endif -
#ifndef __FREETYPE_H__ #define __FREETYPE_H__ --------------snap--------------
Could this be a solution ? Any side effects ?
Nice idea, but I'm afraid it's not enough. For example, building pango still fails with: ... /bin/sh ../../libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I../.. -DPANGO_ENABLE_ENGINE -DSYSCONFDIR=\"/usr/etc\" -DLIBDIR=\"/usr/lib\" -DG_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/X11R6/include -I../.. -O2 -march=i686 -pipe -Wall -c pango-ot-info.c gcc -DHAVE_CONFIG_H -I. -I. -I../.. -DPANGO_ENABLE_ENGINE -DSYSCONFDIR=\"/usr/etc\" -DLIBDIR=\"/usr/lib\" -DG_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/X11R6/include -I../.. -O2 -march=i686 -pipe -Wall -c pango-ot-info.c -fPIC -DPIC -o .libs/pango-ot-info.o pango-ot-info.c:25:31: freetype/ftmodule.h: No such file or directory make[3]: *** [pango-ot-info.lo] Error 1 make[3]: Leaving directory `/home/per/crux/cvs/ports/opt/pango/work/src/pango-1.2.5/pango/opentype' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/home/per/crux/cvs/ports/opt/pango/work/src/pango-1.2.5/pango' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/per/crux/cvs/ports/opt/pango/work/src/pango-1.2.5' make: *** [all-recursive-am] Error 2 I'll just go back to 2.1.5 for now. Let's hope 2.1.8 will have better "compatability glue" or something... /Per