diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-12-09 23:27:48 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-12-09 23:27:48 +0000 |
| commit | 6a4cba93c959b72586fa7631c9dde780f9a54edc (patch) | |
| tree | 4540436b60d3efc09de0dc1a5903a02ef9898939 /sys-boot | |
| parent | Clean out old or unkeyword old versions due to bug #489792 (diff) | |
| download | gentoo-2-6a4cba93c959b72586fa7631c9dde780f9a54edc.tar.gz gentoo-2-6a4cba93c959b72586fa7631c9dde780f9a54edc.tar.bz2 gentoo-2-6a4cba93c959b72586fa7631c9dde780f9a54edc.zip | |
Fix build with freetype-2.5.1, bug 493634 by Thomas Axelsson.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch | 24 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00_p5107-r2.ebuild | 6 |
3 files changed, 33 insertions, 3 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index e91d5eb10ca7..8b86b389771d 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.295 2013/12/09 23:07:13 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.296 2013/12/09 23:27:48 floppym Exp $ + + 09 Dec 2013; Mike Gilbert <floppym@gentoo.org> + +files/grub-2.00-freetype-2.5.1.patch, grub-2.00_p5107-r2.ebuild: + Fix build with freetype-2.5.1, bug 493634 by Thomas Axelsson. 09 Dec 2013; Mike Gilbert <floppym@gentoo.org> grub-9999-r1.ebuild: Adjust *FLAGS logic and drop custom-cflags use flag. diff --git a/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch b/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch new file mode 100644 index 000000000000..286830ccf846 --- /dev/null +++ b/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch @@ -0,0 +1,24 @@ +commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb +Author: Colin Watson <cjwatson@ubuntu.com> +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 + <freetype/ftsynth.h>, 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 <freetype/ftsynth.h> ++#include FT_SYNTHESIS_H + + #undef __FTERRORS_H__ + #define FT_ERROR_START_LIST const char *ft_errmsgs[] = { diff --git a/sys-boot/grub/grub-2.00_p5107-r2.ebuild b/sys-boot/grub/grub-2.00_p5107-r2.ebuild index 0dc1df10b1e1..3baf92f27651 100644 --- a/sys-boot/grub/grub-2.00_p5107-r2.ebuild +++ b/sys-boot/grub/grub-2.00_p5107-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v 1.5 2013/10/26 14:41:41 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v 1.6 2013/12/09 23:27:48 floppym Exp $ EAPI=5 @@ -23,7 +23,9 @@ if [[ ${PV} != 9999 ]]; then S=${WORKDIR}/${P%_*} fi KEYWORDS="amd64 x86" - PATCHES=() + PATCHES=( + "${FILESDIR}/grub-2.00-freetype-2.5.1.patch" + ) else inherit git-r3 EGIT_REPO_URI="git://git.sv.gnu.org/grub.git |