From bc6fc749ebdb52ede5fcda11f1dfbf0690a79639 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Tue, 23 Mar 2004 04:36:17 +0000
Subject: Fix build with freetype2-2.1.7.

Reported by:	bento via kris
---
 print/gnome-print/files/patch-installer_gf-pfb.c             | 12 ++++++++++++
 print/gnome-print/files/patch-installer_gf-ttf.c             | 12 ++++++++++++
 print/gnome-print/files/patch-installer_gnome-font-install.c | 12 ++++++++++++
 .../files/patch-libgnomeprint_gnome-font-private.h           | 12 ++++++++++++
 print/gnome-print/files/patch-libgnomeprint_parseTT.c        | 12 ++++++++++++
 print/gnome-print/files/patch-libgnomeprint_parseTT.h        | 12 ++++++++++++
 print/gnomeprint/files/patch-installer_gf-pfb.c              | 12 ++++++++++++
 print/gnomeprint/files/patch-installer_gf-ttf.c              | 12 ++++++++++++
 print/gnomeprint/files/patch-installer_gnome-font-install.c  | 12 ++++++++++++
 .../files/patch-libgnomeprint_gnome-font-private.h           | 12 ++++++++++++
 print/gnomeprint/files/patch-libgnomeprint_parseTT.c         | 12 ++++++++++++
 print/gnomeprint/files/patch-libgnomeprint_parseTT.h         | 12 ++++++++++++
 12 files changed, 144 insertions(+)
 create mode 100644 print/gnome-print/files/patch-installer_gf-pfb.c
 create mode 100644 print/gnome-print/files/patch-installer_gf-ttf.c
 create mode 100644 print/gnome-print/files/patch-installer_gnome-font-install.c
 create mode 100644 print/gnome-print/files/patch-libgnomeprint_gnome-font-private.h
 create mode 100644 print/gnome-print/files/patch-libgnomeprint_parseTT.c
 create mode 100644 print/gnome-print/files/patch-libgnomeprint_parseTT.h
 create mode 100644 print/gnomeprint/files/patch-installer_gf-pfb.c
 create mode 100644 print/gnomeprint/files/patch-installer_gf-ttf.c
 create mode 100644 print/gnomeprint/files/patch-installer_gnome-font-install.c
 create mode 100644 print/gnomeprint/files/patch-libgnomeprint_gnome-font-private.h
 create mode 100644 print/gnomeprint/files/patch-libgnomeprint_parseTT.c
 create mode 100644 print/gnomeprint/files/patch-libgnomeprint_parseTT.h

diff --git a/print/gnome-print/files/patch-installer_gf-pfb.c b/print/gnome-print/files/patch-installer_gf-pfb.c
new file mode 100644
index 000000000000..6774d50122b7
--- /dev/null
+++ b/print/gnome-print/files/patch-installer_gf-pfb.c
@@ -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
diff --git a/print/gnome-print/files/patch-installer_gf-ttf.c b/print/gnome-print/files/patch-installer_gf-ttf.c
new file mode 100644
index 000000000000..ad7cf3779c56
--- /dev/null
+++ b/print/gnome-print/files/patch-installer_gf-ttf.c
@@ -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"
+ 
diff --git a/print/gnome-print/files/patch-installer_gnome-font-install.c b/print/gnome-print/files/patch-installer_gnome-font-install.c
new file mode 100644
index 000000000000..d1ee9d152f7d
--- /dev/null
+++ b/print/gnome-print/files/patch-installer_gnome-font-install.c
@@ -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>
diff --git a/print/gnome-print/files/patch-libgnomeprint_gnome-font-private.h b/print/gnome-print/files/patch-libgnomeprint_gnome-font-private.h
new file mode 100644
index 000000000000..f2a1a880c410
--- /dev/null
+++ b/print/gnome-print/files/patch-libgnomeprint_gnome-font-private.h
@@ -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>
diff --git a/print/gnome-print/files/patch-libgnomeprint_parseTT.c b/print/gnome-print/files/patch-libgnomeprint_parseTT.c
new file mode 100644
index 000000000000..218bdd1438d6
--- /dev/null
+++ b/print/gnome-print/files/patch-libgnomeprint_parseTT.c
@@ -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>
diff --git a/print/gnome-print/files/patch-libgnomeprint_parseTT.h b/print/gnome-print/files/patch-libgnomeprint_parseTT.h
new file mode 100644
index 000000000000..f938cc0d4d5a
--- /dev/null
+++ b/print/gnome-print/files/patch-libgnomeprint_parseTT.h
@@ -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
diff --git a/print/gnomeprint/files/patch-installer_gf-pfb.c b/print/gnomeprint/files/patch-installer_gf-pfb.c
new file mode 100644
index 000000000000..6774d50122b7
--- /dev/null
+++ b/print/gnomeprint/files/patch-installer_gf-pfb.c
@@ -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
diff --git a/print/gnomeprint/files/patch-installer_gf-ttf.c b/print/gnomeprint/files/patch-installer_gf-ttf.c
new file mode 100644
index 000000000000..ad7cf3779c56
--- /dev/null
+++ b/print/gnomeprint/files/patch-installer_gf-ttf.c
@@ -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"
+ 
diff --git a/print/gnomeprint/files/patch-installer_gnome-font-install.c b/print/gnomeprint/files/patch-installer_gnome-font-install.c
new file mode 100644
index 000000000000..d1ee9d152f7d
--- /dev/null
+++ b/print/gnomeprint/files/patch-installer_gnome-font-install.c
@@ -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>
diff --git a/print/gnomeprint/files/patch-libgnomeprint_gnome-font-private.h b/print/gnomeprint/files/patch-libgnomeprint_gnome-font-private.h
new file mode 100644
index 000000000000..f2a1a880c410
--- /dev/null
+++ b/print/gnomeprint/files/patch-libgnomeprint_gnome-font-private.h
@@ -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>
diff --git a/print/gnomeprint/files/patch-libgnomeprint_parseTT.c b/print/gnomeprint/files/patch-libgnomeprint_parseTT.c
new file mode 100644
index 000000000000..218bdd1438d6
--- /dev/null
+++ b/print/gnomeprint/files/patch-libgnomeprint_parseTT.c
@@ -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>
diff --git a/print/gnomeprint/files/patch-libgnomeprint_parseTT.h b/print/gnomeprint/files/patch-libgnomeprint_parseTT.h
new file mode 100644
index 000000000000..f938cc0d4d5a
--- /dev/null
+++ b/print/gnomeprint/files/patch-libgnomeprint_parseTT.h
@@ -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
-- 
cgit v1.2.3