From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 29 Nov 2013 12:19:36 +0000 (+0000)
Subject: Fix build with FreeType 2.5.1
X-Git-Tag: grub-2.02-beta1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb;p=thirdparty%2Fgrub.git

Fix build with FreeType 2.5.1

* util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
<freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
* util/grub-gen-widthspec.c: Likewise.
* util/grub-mkfont.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 46ead9c55..346c01b83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-29  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
+	<freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
+	* util/grub-gen-widthspec.c: Likewise.
+	* util/grub-mkfont.c: Likewise.
+
 2013-11-29  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* util/grub-setup.c (main): Move parsing of (hdX) syntax to ...
diff --git a/util/grub-gen-asciih.c b/util/grub-gen-asciih.c
index 2e3669918..e01447ae9 100644
--- a/util/grub-gen-asciih.c
+++ b/util/grub-gen-asciih.c
@@ -26,7 +26,7 @@
 #include FT_FREETYPE_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_TABLES_H
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
 
 #undef __FTERRORS_H__
 #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
diff --git a/util/grub-gen-widthspec.c b/util/grub-gen-widthspec.c
index 9bab8c49c..33bc8cb2d 100644
--- a/util/grub-gen-widthspec.c
+++ b/util/grub-gen-widthspec.c
@@ -26,7 +26,7 @@
 #include FT_FREETYPE_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_TABLES_H
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
 
 #undef __FTERRORS_H__
 #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 0d8eb787c..242dd01ee 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -43,7 +43,7 @@
 #include FT_FREETYPE_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_TABLES_H
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
 
 #undef __FTERRORS_H__
 #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = {