Fix build with freetype2-2.1.7.

Reported by:	bento via kris
This commit is contained in:
Joe Marcus Clarke 2004-03-23 04:36:17 +00:00
parent 5800193a29
commit bc6fc749eb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=104999
12 changed files with 144 additions and 0 deletions

View file

@ -0,0 +1,12 @@
--- installer/gf-pfb.c.orig Mon Mar 22 23:33:20 2004
+++ installer/gf-pfb.c Mon Mar 22 23:33:36 2004
@@ -12,7 +12,8 @@
#include <fcntl.h>
#include <string.h>
#include <ctype.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include "gf-pfb.h"
#define noVERBOSE

View file

@ -0,0 +1,12 @@
--- installer/gf-ttf.c.orig Mon Mar 22 23:34:10 2004
+++ installer/gf-ttf.c Mon Mar 22 23:34:23 2004
@@ -32,7 +32,8 @@
#include <fcntl.h>
#include <string.h>
#include <ctype.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include "gf-ttf.h"

View file

@ -0,0 +1,12 @@
--- installer/gnome-font-install.c.orig Mon Mar 22 23:32:31 2004
+++ installer/gnome-font-install.c Mon Mar 22 23:32:44 2004
@@ -26,7 +26,8 @@
#include <parser.h>
#include <xmlmemory.h>
/* End of ugly thing */
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-util.h>
#include <libgnome/gnome-i18n.h>

View file

@ -0,0 +1,12 @@
--- libgnomeprint/gnome-font-private.h.orig Mon Mar 22 23:31:37 2004
+++ libgnomeprint/gnome-font-private.h Mon Mar 22 23:31:52 2004
@@ -22,7 +22,8 @@
BEGIN_GNOME_DECLS
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <libgnomeprint/gp-character-block.h>
#include <libgnomeprint/gp-fontmap.h>
#include <libgnomeprint/gnome-font.h>

View file

@ -0,0 +1,12 @@
--- libgnomeprint/parseTT.c.orig Mon Mar 22 23:29:57 2004
+++ libgnomeprint/parseTT.c Mon Mar 22 23:30:15 2004
@@ -107,7 +107,8 @@
#include <config.h>
#include <parseTT.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <freetype/ftglyph.h>
#include <freetype/ftoutln.h>
#include <stdio.h>

View file

@ -0,0 +1,12 @@
--- libgnomeprint/parseTT.h.orig Mon Mar 22 23:30:50 2004
+++ libgnomeprint/parseTT.h Mon Mar 22 23:31:05 2004
@@ -22,7 +22,8 @@
BEGIN_GNOME_DECLS
#include <glib.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
/*
* Convert loaded Freetype TTF face to Type1

View file

@ -0,0 +1,12 @@
--- installer/gf-pfb.c.orig Mon Mar 22 23:33:20 2004
+++ installer/gf-pfb.c Mon Mar 22 23:33:36 2004
@@ -12,7 +12,8 @@
#include <fcntl.h>
#include <string.h>
#include <ctype.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include "gf-pfb.h"
#define noVERBOSE

View file

@ -0,0 +1,12 @@
--- installer/gf-ttf.c.orig Mon Mar 22 23:34:10 2004
+++ installer/gf-ttf.c Mon Mar 22 23:34:23 2004
@@ -32,7 +32,8 @@
#include <fcntl.h>
#include <string.h>
#include <ctype.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include "gf-ttf.h"

View file

@ -0,0 +1,12 @@
--- installer/gnome-font-install.c.orig Mon Mar 22 23:32:31 2004
+++ installer/gnome-font-install.c Mon Mar 22 23:32:44 2004
@@ -26,7 +26,8 @@
#include <parser.h>
#include <xmlmemory.h>
/* End of ugly thing */
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-util.h>
#include <libgnome/gnome-i18n.h>

View file

@ -0,0 +1,12 @@
--- libgnomeprint/gnome-font-private.h.orig Mon Mar 22 23:31:37 2004
+++ libgnomeprint/gnome-font-private.h Mon Mar 22 23:31:52 2004
@@ -22,7 +22,8 @@
BEGIN_GNOME_DECLS
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <libgnomeprint/gp-character-block.h>
#include <libgnomeprint/gp-fontmap.h>
#include <libgnomeprint/gnome-font.h>

View file

@ -0,0 +1,12 @@
--- libgnomeprint/parseTT.c.orig Mon Mar 22 23:29:57 2004
+++ libgnomeprint/parseTT.c Mon Mar 22 23:30:15 2004
@@ -107,7 +107,8 @@
#include <config.h>
#include <parseTT.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <freetype/ftglyph.h>
#include <freetype/ftoutln.h>
#include <stdio.h>

View file

@ -0,0 +1,12 @@
--- libgnomeprint/parseTT.h.orig Mon Mar 22 23:30:50 2004
+++ libgnomeprint/parseTT.h Mon Mar 22 23:31:05 2004
@@ -22,7 +22,8 @@
BEGIN_GNOME_DECLS
#include <glib.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
/*
* Convert loaded Freetype TTF face to Type1