Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2013-12-11 15:40:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2013-12-02 15:07:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2013-12-11 15:40:08.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 10 19:13:53 UTC 2013 - [email protected] + +- add patch 0001-Fix-build-with-FreeType-2.5.1.patch - fix build with + freetype2 >= 2.5.1 (backport from fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb) + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-FreeType-2.5.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.HKJM65/_old 2013-12-11 15:40:09.000000000 +0100 +++ /var/tmp/diff_new_pack.HKJM65/_new 2013-12-11 15:40:09.000000000 +0100 @@ -134,6 +134,7 @@ 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 @@ %patch37 -p1 %patch38 -p1 %patch39 -p1 +%patch40 -p1 # Generate po/LINGUAS for message catalogs ... ./linguas.sh ++++++ 0001-Fix-build-with-FreeType-2.5.1.patch ++++++ >From fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb Mon Sep 17 00:00:00 2001 From: Colin Watson <[email protected]> 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[] = { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
