Fix build with freetype-2.5.1, bug 493634 by Thomas Axelsson.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 39 insertions, 8 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/Manifest b/sys-boot/grub/Manifest
index 45258e55b8f8..23ccf3c83d7b 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -12,6 +12,7 @@ AUX grub-2.00-compression.patch 2051 SHA256 003cc6b8762adbff14c1d0f7a0c2ddb145e8
 AUX grub-2.00-config-quoting.patch 3934 SHA256 4f1bc29429a864731edf4a5a5fa53004dc67bf1225bd8fa81cb58b197df12510 SHA512 bed0fb1a8589c1979cf7162599e041c8b8eaa66bff3e8fa4a8b9929c8e8191ec1f85c129bcf2f7c9dcc75d5ea50330067ffd519835308460f7a194aab40bfc13 WHIRLPOOL 979234f1d3e1282d1e6d3ac4aa1e01c86082a3883abd452f0f1886181a6d46ccccd8e6b59628acfa8dc375ad9db1b35037d9483f87df2893a7398402dc7cb51a
 AUX grub-2.00-dmraid.patch 695 SHA256 de077f5511fa41effdcfd215e15b8bd3cff741522d84ad692e2268423a4d1609 SHA512 69d578fd3182ad5b43ee8e50c425cc6f9a4226c42a018eb916c1386a3abf282f0e7ac7e7125d1d32e8d0d7242e143b75e888fab823e833019f9199560d1d15a9 WHIRLPOOL ef9870c3bbcaabf15e0cbf7eea951110872b8b3fe609a6c8d9e37b97e882ddcc147caf3cea7aac033806e0d8ff49576386599df4c4bd2371c56024fcaef9f850
 AUX grub-2.00-freebsd.patch 16465 SHA256 5464dda43bed28634e406a3b182db1d76e70059e0a3b3c276ee91ff27ca78cbd SHA512 d0fecaf83796971ef6f2cd43cab4c89faf1496d4241e249467d7839b366c616e15a8c6961d9224ed0e139d018d5d9f354cf59ddf2ef5e915a4b03e11dbdf568e WHIRLPOOL 963c61923503a57894634f0b3431e8e701a83f6514e5829f0ed91fc3c9011fa39870c319e1cbfee62341f1d37dfd0fdadcd4a028b725bb65d2f06fbedfd31166
+AUX grub-2.00-freetype-2.5.1.patch 752 SHA256 95ddb348097df2bdf51a36529935118ad4bb51cb780038d149ed0ae3bf0693c9 SHA512 e9d05de956364b923e01d8f71d77f05d6c0815b7ae21ec5d34875de09770ce42b52f7d410314f7e4a273256350d7cbf311cf95a5d83e469c7a83b9b69879caff WHIRLPOOL 67751eaad605cf064106f2a304657bf1fe1ea1f4bb3f6efe436f2d7e6b84e80b56327e51cff4db63a7f34e7f21a456d3c7517d6ee6da5f8f2cbd7816f34d4016
 AUX grub-2.00-hardcoded-awk.patch 599 SHA256 438c7357a632c7c9efe406b1d7cbb2524694e68c5783b401d3dd17ae0aba6816 SHA512 f47b742b9fa4c57e36e767ace6e14318678cc429ae88cd275e07d95abbc8d3d01d831058da2f6f91662bfdfc4396aed5417198245534488359a43023459d1a1f WHIRLPOOL 17be198f854466ff8a50c5b7d46eaf7883a4ce8cbe3a89cbc0e62d75ae71e94ce863341c0650b113bbee4415220da38896da73177ab59d2b53d3bde7ec9809ba
 AUX grub-2.00-no-gets.patch 805 SHA256 054d85619905055a0ea0e5f9d27eb8c8596959598ac9a5bae7e82543c19adeaf SHA512 8b89fa40efe232474e7bb03d12542030d40fea1fe0839a9493f6704fbe6de77516b5976841bf652c7236104513f427750efc668248c71ba0ea7f676557e8c9e3 WHIRLPOOL 796a7bc4583829abd1a552f7d16d6cc4f2999707af1ae0b5231fa53e87ce22a265a35a3d0f486fcac2e74dbed5fd54e3a572186cc2ba1a849433adc021a0a65b
 AUX grub-2.00-os-prober-efi-system.patch 834 SHA256 486ab3e6b7aef74c3e81be3fdb0ceb357b6115cb56ac80a470820a00d10cc884 SHA512 671a847abac49b098d455f473a97c9f47c7e9d837898ed5e53e751aa65bdfca32b9bb2f3d8f7ec544730cb1fe1208ebbb9163ae9cf6b16a3c0ae1b087921b097 WHIRLPOOL 402f8530d2b9f4ec496f8aa454a6f0720542034f58acd6d5c9f17bbec83e3e9ab2d6fc7b5720fcfae4eacf04800c846bd7f33ff2949c22e4a822dad15abec7fe
@@ -66,15 +67,15 @@ EBUILD grub-0.97-r9.ebuild 9053 SHA256 b6411eb5c379cc6b9120f1f727733d9724c425740
 EBUILD grub-0.97.ebuild 4238 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1 SHA512 46d72cfaa5735d0b3d2d89a8e6ce83745e4645370cdbbfcffc37d1413ffeb2b1caafac8c7cc712925ffc09411870b06467eb50bc475997508e7beea8fa5172d7 WHIRLPOOL 4b6fe9a7300baf6364555858a49ae2775ea0da27291d5d48fa634097531ae3b6da445ee2f959ef584bf4c913aad5e689b77e7326af257549ef107704dc0d202e
 EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585 SHA512 520bd623cfaf70451b4331f2dc464982f4de1b0c070ee8c0b336c9d16589aaa96924ea923f4c47ccb07d3c8f6da987a89ed285f1f4fa8f922465ab912e8940bd WHIRLPOOL 5abb91bf54a5024b225e7c3891b884827b31e6e8e380db9aa37fd520c55cd2e94ce1e7545271d52a58baab63446906cb69440177a4678000ac519088b9ae6966
 EBUILD grub-2.00-r4.ebuild 6772 SHA256 567b9c19af55d0687a084eab551197c6bb2b36bc800375f6fc3522b611effb19 SHA512 0a09c35b7e534a772451eb3a3ef8a6333d89abc9b6e3cae4548e4e289fe8104e1282fe7e1ca699a5d2650fb83ae75f06ee732ec13b2d6e509c3311591e654427 WHIRLPOOL ab8e4b5566283f6f07b31022e646863f44b37a8d8bb210bc7db7843220b25cf235599fc458225792afabec5e449e3d72dd005ee75d904b8e62b857e6bf680253
-EBUILD grub-2.00_p5107-r2.ebuild 8031 SHA256 61d9f753e1517eb71b586718f926e2476a333bdb932ed3e98e79152968451408 SHA512 b5342feaf1e08b12f402158a3e9440c05d0b9b61b3732faad4fe4dd24b3288e54b46ac1e6aadab4aaa374e13f0bc3d3065a41c7f56e52c8aa28da0effca0d9e4 WHIRLPOOL ebe46428076776d7a91233a121cbcbdad98c1f9b0b8954d30b5e6f8b68e8b47e5bbfd9ba827b55b02727fe6057946decb6b48c4cb5266800769a23fa65bd85ac
+EBUILD grub-2.00_p5107-r2.ebuild 8080 SHA256 a962749fb4ef3cac0bdbe7faa620380a2d6cb064b37823dc71201dab8356804a SHA512 e29425d7262e5902fd9e87ed6c7e72df15dd670152c6dcd365b5c6e0ee8019599e3314a4cdea867de6acd7d2babcdb66b91535d7ceeb7c58c60ebca9407bb19c WHIRLPOOL 19d522b67db7139193505f93aa5a474e5f88a5d2ee322d7c8283c2c2ad7984bfaf9cbfae6820d125b11b8b0a8b41b049b3ca72e9c60b8f0a4d82653ea791c34e
 EBUILD grub-2.00_p5107.ebuild 6567 SHA256 fecc66f9d1f45a940530ddaf1fc9fcb1c05c2346b1ee8170c3a897d7be5c5fd9 SHA512 7ce9b814878dceb204dbe5a7103517ab451bce414e2075420e234392369b5edd82e499907becdabff456ad3c5ca53ede74dfa7132ed1b33904f44c52fc471cd0 WHIRLPOOL 103d3db1fb21055d69289717bf6acef361cc4fec4e862413f90d047987889d8b248b5c15288977aab2f3df686990dd14f3e6a3cf90da0d3eb0a066f2b773a593
 EBUILD grub-9999-r1.ebuild 8186 SHA256 2f157600d56098e6fdd36141bda8850c56722da73d8966822398371bbe1daeca SHA512 946f35d6dfed924ad6570d884c8965f69851f73fb8cc155a35b5353296f22b7de86c11c92fd94751f1d52349c93533889d2afaaaf1778bcac687555d0192ede4 WHIRLPOOL 8d55a2ce22831cbaadfd8912434c86d51644b76b2bbaa39f7623f3ce8149df400cf654ef2d1eb26f7789f427c85de57176b8c877b1a413129920104f66fa09ab
-MISC ChangeLog 55266 SHA256 8d9a570290be892227ebedaf42930a730a2740b8e8a4590da7e6ee1a5a8121c3 SHA512 07066883f47f8c47af56207a84004160c58b5cb5f0a30aa287b67d03c991e90fd0d402ffb875dd13c9bdbfee9f8ec32b7fc53691b818bfcde5df4ed285474f71 WHIRLPOOL 6bf31fb9b5c006b515c3d6dc9b12fa282fbd4da5ee005c5ce1447566d4042910b188396f6b8581fab7ad63e6437d1ca2bf79c7dfd53d355c16ef24c5a950cca8
+MISC ChangeLog 55448 SHA256 08d697c4074071611266a03cdb27787b37eafdf37b971b8d54bc9788a19bde12 SHA512 c899f2381e8ec22cabce67f635e1c6c3a87b3c7598ab9fc15dc38e93f75bc74071cd0ce4bd88368d15daee30ef9e64e81b96c5727e160ba55c9be79cc8023947 WHIRLPOOL bc1b58c21421d70336f277311de12e0b4a81438bdfe3121b0618dca446a257de4be9e582c3f73fa7456f74b74ff0ce53c83882768a3927284a5259595e29743b
 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKmTSIACgkQC77qH+pIQ6TqZAEAlTPp3890XC6SUCSdO42Cb76Z
-oB6gaBPQx6QsFKY+N5sBALFyi8Fu/+nIWjXTuWEf97BNfy8PGh/2bIvCow3o22he
-=8HNT
+iF4EAREIAAYFAlKmUfYACgkQC77qH+pIQ6SlhQD9GaiTx/F4iuJ3bv8EeJz9RzCx
+7APjEwIGZKePDrVqXicA+weOV+e8jSGou7PzsHwP8Kq4kJrCgXNgtfLeVkedEU87
+=AfL+
 -----END PGP SIGNATURE-----
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