vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix build with FreeType 2.5.1

Browse source 
* 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.
This commit is contained in:
Colin Watson 2013-11-29 12:19:36 +00:00
parent 69ca97c820
commit fd0df6d098
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2013-11-29 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub-setup.c (main): Move parsing of (hdX) syntax to ... * util/grub-setup.c (main): Move parsing of (hdX) syntax to ...

2
util/grub-gen-asciih.c
View file

@ -26,7 +26,7 @@
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_TRUETYPE_TAGS_H #include FT_TRUETYPE_TAGS_H
#include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TABLES_H
#include <freetype/ftsynth.h> #include FT_SYNTHESIS_H
#undef __FTERRORS_H__ #undef __FTERRORS_H__
#define FT_ERROR_START_LIST const char *ft_errmsgs[] = { #define FT_ERROR_START_LIST const char *ft_errmsgs[] = {

2
util/grub-gen-widthspec.c
View file

@ -26,7 +26,7 @@
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_TRUETYPE_TAGS_H #include FT_TRUETYPE_TAGS_H
#include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TABLES_H
#include <freetype/ftsynth.h> #include FT_SYNTHESIS_H
#undef __FTERRORS_H__ #undef __FTERRORS_H__
#define FT_ERROR_START_LIST const char *ft_errmsgs[] = { #define FT_ERROR_START_LIST const char *ft_errmsgs[] = {

2
util/grub-mkfont.c
View file

@ -43,7 +43,7 @@
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_TRUETYPE_TAGS_H #include FT_TRUETYPE_TAGS_H
#include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TABLES_H
#include <freetype/ftsynth.h> #include FT_SYNTHESIS_H
#undef __FTERRORS_H__ #undef __FTERRORS_H__
#define FT_ERROR_START_LIST const char *ft_errmsgs[] = { #define FT_ERROR_START_LIST const char *ft_errmsgs[] = {