From 9df8033f5868872159028a198387b61fbd218198df14281657a5de12354d1d7c Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 11 Dec 2013 04:28:48 +0000 Subject: [PATCH] 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 --- 0001-Fix-build-with-FreeType-2.5.1.patch | 29 ++++++++++++++++++++++++ grub2.changes | 6 +++++ grub2.spec | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 0001-Fix-build-with-FreeType-2.5.1.patch diff --git a/0001-Fix-build-with-FreeType-2.5.1.patch b/0001-Fix-build-with-FreeType-2.5.1.patch new file mode 100644 index 0000000..003f403 --- /dev/null +++ b/0001-Fix-build-with-FreeType-2.5.1.patch @@ -0,0 +1,29 @@ +From fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb Mon Sep 17 00:00:00 2001 +From: Colin Watson +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 +, 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 ++#include FT_SYNTHESIS_H + + #undef __FTERRORS_H__ + #define FT_ERROR_START_LIST const char *ft_errmsgs[] = { diff --git a/grub2.changes b/grub2.changes index ddc0b11..724748c 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 10 19:13:53 UTC 2013 - arvidjaar@gmail.com + +- add patch 0001-Fix-build-with-FreeType-2.5.1.patch - fix build with + freetype2 >= 2.5.1 (backport from fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb) + ------------------------------------------------------------------- Sun Dec 1 13:10:23 UTC 2013 - arvidjaar@gmail.com diff --git a/grub2.spec b/grub2.spec index 1a42ca7..76a649b 100644 --- a/grub2.spec +++ b/grub2.spec @@ -134,6 +134,7 @@ Patch36: grub2-fix-parsing-of-short-LVM-PV-names.patch Patch37: grub2-fix-descriptor-leak-in-grub_util_is_imsm.patch Patch38: grub2-fix-x86_64-efi-startup-stack-alignment.patch Patch39: grub2-fix-x86_64-efi-callwrap-stack-alignment.patch +Patch40: 0001-Fix-build-with-FreeType-2.5.1.patch Requires: gettext-runtime %if 0%{?suse_version} >= 1140 Requires: os-prober @@ -252,6 +253,7 @@ mv po/grub.pot po/%{name}.pot %patch37 -p1 %patch38 -p1 %patch39 -p1 +%patch40 -p1 # Generate po/LINGUAS for message catalogs ... ./linguas.sh