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 46ead9c5532e7418248ee341ecc57521c06dabb4..346c01b838e706a80f05875a9c0870c300c0965a 100644 (file)
--- 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 2e36699188addb71d1958d9edb5b5dbf1350b6fc..e01447ae94fb9653891649c95593935192bae66a 100644 (file)
--- 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 9bab8c49c526fed793d7c28b63a831d6da8bb328..33bc8cb2d9d1d06b0f1005cf634829f795bc8e63 100644 (file)
--- 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 0d8eb787c5014f6e1b4e459779a8583ad0f25fb7..242dd01eeb16bb8ee8d9d5cd3a18e2936a6adf25 100644 (file)
--- 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[] = {