rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 210446 from home:arvidjaar:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Michael Chang 2013-12-11 04:28:48 +00:00 committed by Git OBS Bridge
parent 1a79633072
commit 9df8033f58
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Fix-build-with-FreeType-2.5.1.patch Normal file
View File

@ -0,0 +1,29 @@
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[] = {

6
grub2.changes
View File

@ -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 Sun Dec 1 13:10:23 UTC 2013 - arvidjaar@gmail.com

2
grub2.spec
View File

@ -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 Patch37: grub2-fix-descriptor-leak-in-grub_util_is_imsm.patch
Patch38: grub2-fix-x86_64-efi-startup-stack-alignment.patch Patch38: grub2-fix-x86_64-efi-startup-stack-alignment.patch
Patch39: grub2-fix-x86_64-efi-callwrap-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 Requires: gettext-runtime
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
Requires: os-prober Requires: os-prober
@ -252,6 +253,7 @@ mv po/grub.pot po/%{name}.pot
%patch37 -p1 %patch37 -p1
%patch38 -p1 %patch38 -p1
%patch39 -p1 %patch39 -p1
%patch40 -p1
# Generate po/LINGUAS for message catalogs ... # Generate po/LINGUAS for message catalogs ...
./linguas.sh ./linguas.sh