From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= Subject: [PATCH] gnu: grub: Add patch to fix new version of freetype Date: Thu, 5 Mar 2015 09:17:17 +0100 Message-ID: <1425543437-10707-1-git-send-email-sleep_walker@suse.cz> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTQyV-0002rB-BB for guix-devel@gnu.org; Thu, 05 Mar 2015 03:17:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTQyB-0003ba-Qc for guix-devel@gnu.org; Thu, 05 Mar 2015 03:17:43 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42199 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTQyB-0003aY-IW for guix-devel@gnu.org; Thu, 05 Mar 2015 03:17:23 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D8A32ABED for ; Thu, 5 Mar 2015 08:17:21 +0000 (UTC) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/patches/grub-freetype.patch: New file. * gnu-system.am (dist_patch_DATA): Add the patch. * gnu/packages/grub.scm (grub): Apply new patch. --- gnu-system.am | 1 + gnu/packages/grub.scm | 3 ++- gnu/packages/patches/grub-freetype.patch | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-freetype.patch diff --git a/gnu-system.am b/gnu-system.am index 0497fe1..a9679fd 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -414,6 +414,7 @@ dist_patch_DATA = \ gnu/packages/patches/gobject-introspection-cc.patch \ gnu/packages/patches/gobject-introspection-girepository.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ + gnu/packages/patches/grub-freetype.patch \ gnu/packages/patches/gstreamer-0.10-bison3.patch \ gnu/packages/patches/gstreamer-0.10-silly-test.patch \ gnu/packages/patches/guile-1.8-cpp-4.5.patch \ diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index 5504f38..b1da394 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -79,7 +79,8 @@ (sha256 (base32 "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq")) - (patches (list (search-patch "grub-gets-undeclared.patch"))))) + (patches (list (search-patch "grub-gets-undeclared.patch") + (search-patch "grub-freetype.patch"))))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-werror") diff --git a/gnu/packages/patches/grub-freetype.patch b/gnu/packages/patches/grub-freetype.patch new file mode 100644 index 0000000..286830c --- /dev/null +++ b/gnu/packages/patches/grub-freetype.patch @@ -0,0 +1,24 @@ +commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb +Author: Colin Watson +Date: Fri Nov 29 12:19:36 2013 +0000 + + 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. + +diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c +index 0d8eb78..242dd01 100644 +--- a/util/grub-mkfont.c ++++ b/util/grub-mkfont.c +@@ -43,7 +43,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[] = { -- 2.0.5