SHA256
1
0
forked from pool/grub2
grub2/0001-Fix-build-with-FreeType-2.5.1.patch
Michael Chang 9df8033f58 Accepting request 210446 from home:arvidjaar:branches:Base:System
- add patch 0001-Fix-build-with-FreeType-2.5.1.patch - fix build with
  freetype2 >= 2.5.1 (backport from fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb)

OBS-URL: https://build.opensuse.org/request/show/210446
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=58
2013-12-11 04:28:48 +00:00

30 lines
1002 B
Diff

From fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 29 Nov 2013 12:19:36 +0000
Subject: [PATCH] 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.
---
ChangeLog | 7 +++++++
util/grub-gen-asciih.c | 2 +-
util/grub-gen-widthspec.c | 2 +-
util/grub-mkfont.c | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
Index: grub-2.00/util/grub-mkfont.c
===================================================================
--- grub-2.00.orig/util/grub-mkfont.c
+++ grub-2.00/util/grub-mkfont.c
@@ -39,7 +39,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[] = {