[packages/grub2] Fix #include for a freetype header file

jajcus jajcus at pld-linux.org
Sat Nov 30 12:45:14 CET 2013


commit 690fc71e918c95c3abbcbfd9918a6bd02aeb9b9d
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sat Nov 30 12:44:19 2013 +0100

    Fix #include for a freetype header file
    
    Should fix: 'fatal error: freetype/ftsynth.h: No such file or directory'

 grub2-freetype_include.patch | 12 ++++++++++++
 grub2.spec                   |  2 ++
 2 files changed, 14 insertions(+)
---
diff --git a/grub2.spec b/grub2.spec
index d4d3d85..1cbc136 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -77,6 +77,7 @@ Patch19:	search-for-specific-config-file-for-netboot.patch
 Patch20:	ignore-kernel-symlinks.patch
 Patch21:	choose-preferred-initrd.patch
 Patch22:	%{name}-cfg.patch
+Patch23:	%{name}-freetype_include.patch
 URL:		http://www.gnu.org/software/grub/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.11.1-1
@@ -306,6 +307,7 @@ Motyw starfield dla GRUB-a.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p0
+%patch23 -p1
 
 %build
 # if gold is used then grub doesn't even boot
diff --git a/grub2-freetype_include.patch b/grub2-freetype_include.patch
new file mode 100644
index 0000000..185ce70
--- /dev/null
+++ b/grub2-freetype_include.patch
@@ -0,0 +1,12 @@
+diff -dur grub-2.00.orig/util/grub-mkfont.c grub-2.00/util/grub-mkfont.c
+--- grub-2.00.orig/util/grub-mkfont.c	2012-03-10 13:17:57.000000000 +0100
++++ grub-2.00/util/grub-mkfont.c	2013-11-30 12:42:43.623031541 +0100
+@@ -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[] = { 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/690fc71e918c95c3abbcbfd9918a6bd02aeb9b9d



More information about the pld-cvs-commit mailing list