Fix from Chromium OS for building w/freetype-2.5.3 #508748 by Stefan Kalis.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 46 insertions, 22 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index 893ad8460165..ab5651a63936 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/imaging
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.91 2013/09/05 18:46:38 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.92 2014/07/30 01:21:21 vapier Exp $
+
+  30 Jul 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/imaging-1.1.7-ft-header-include.patch, imaging-1.1.7-r4.ebuild:
+  Fix from Chromium OS for building w/freetype-2.5.3 #508748 by Stefan Kalis.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> imaging-1.1.7-r2.ebuild,
   imaging-1.1.7-r4.ebuild:
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
index 235fe3e23754..bad7ec1bb636 100644
--- a/dev-python/imaging/Manifest
+++ b/dev-python/imaging/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX imaging-1.1.7-ft-header-include.patch 432 SHA256 5edaf0cb22b62aa0bb1626fd243c728323c7e6a3ca884bdfa63a7fbcf089bffb SHA512 2fa491cede517c1adce04aaac9fdad8ea8ccc5409d11c0da514995149476cb7903237ac5d7875210280551a2c69741f2a91968022957b21d73c1bd35956be632 WHIRLPOOL 4a26117d7b7add5aa14a44964da83248e4f1667c481f233384dd30aa30e47e34d3a7316ef28d4286f88cb19725483dacc438a0e72ca7866211816980310d50b3
 AUX imaging-1.1.7-giftrans.patch 530 SHA256 70af27dc98f63bb3e625685ba82e6660f7b605453a1f995e4ca420af49c49c6f SHA512 104e1685f4a01a7c6743d80328c7738b19a04415e4f941f5155e1f27237bd6db4dcb829b20b749d36031333ff44603c5d0780ccf48635d1049d236e2a458e19d WHIRLPOOL bcf324b2e85ce89ce15344c18abe2c55263f3107f127db86fbce37706bf1cbae411573bfbe27b5132114aec2002452077c38e237b2c089a8026639da5ce5def4
 AUX imaging-1.1.7-missing-math.patch 717 SHA256 9bce95374278416d183a7a5dd67de7d4b0c4e98bb7ee61dc29821a9fe2ae3a15 SHA512 73ac3c7e59fd29eed7b07042bdb3dcc0067210be0ba0f5eb536fb7076883173ee713d30da4cdc46023abda3941930069ebfacebed25549b7c4c2b677a904acb3 WHIRLPOOL 86babecb9526feaae77e6e2dc56ab116d041564ceb82ecc2f31d11689c66742f3a5e2d7cf9a871dd272c71d4250061a7a709351f38aacce9e0ed706fe44fa129
 AUX imaging-1.1.7-no-xv.patch 691 SHA256 d692f9085fefb06559ee63628852ce72a498657bccdd3ba500e8278ae22b145a SHA512 8a42a75a198ae9da4875e23fd26a834e5fb2209b1e6f67a99d6d14e02cd3ea5e1020d46c3a75df9442eea761de8f8e999551a1af45f2496b5f70fb3fafc80e5c WHIRLPOOL a1cced6e904e75b89abeb6d47b07dc2b33a43e3044d7f7243bd906647020ef42c588eb415f5e81344f5aede0dfa49a31405431d314a35cf37d43b5a7050280bf
@@ -9,25 +10,23 @@ AUX imaging-1.1.7-sane.patch 401 SHA256 9d6bc8d5134bdaa199bc39e793a46dad42c57659
 DIST Imaging-1.1.7.tar.gz 498749 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 SHA512 fec2d39b4db3cb33cd7e7895aba4c3a8a5d4cff28decb9106c88e392cb848edf5593fcd77d11994bb16321837fdb26958787dac2c86d6f7c09996f466bac11f1 WHIRLPOOL e610b4097723f77de4c495537c64741ee4bd996f89d12e2e7853fb8f09028d02fa46920a86827f263eb6324a9063d2321ff865c80b7f8482b19f8143500575e8
 EBUILD imaging-1.1.7-r1.ebuild 2721 SHA256 871fba0e3b0d4e46a46834a1623ce5354fd94fdbe13396d05da5d82c97fef47d SHA512 58c432ec574c6ca43ec6cd1042f542f774ab38a42bff469e714274b30ba6854a5a3a3b63cc714896623e6fa4d28edf8639aa0898da65d14ad2631944b9b46527 WHIRLPOOL 664d45effef8751a13f8bc0beea9961af964f4a62522d3dcd5a0c145c086a9a0c790dad27c354a329734a774ce3f61f967e19e156a7581d8fc4882bb9ad616d2
 EBUILD imaging-1.1.7-r2.ebuild 2385 SHA256 5e37618dfe0592034e3849744049b301551f31917aa1658179de53db404887c0 SHA512 e27e9273077e83dd41a9a79e27b540c80d4323a6364d6669a1efefdce237271cbbca9f0b8f18dc2ebd0941d584d4f4213bdc4a02e0952338bafdbbfbccb30d53 WHIRLPOOL ec90b1a9f4099a274f67e5a7ef1bffbe849c03599f7df4b98153a08fbaff45af588793785954a4c7ebef4b7f66d80ca5790f9e5b2b2190a4cd37652ab80435aa
-EBUILD imaging-1.1.7-r4.ebuild 2404 SHA256 e0706155f53d7b653d4e905eaa6cd20f62906409c9a8e954b113bc00580bf0a2 SHA512 96a1aa34dd7ff5e64e3e793bae9a73acb455bbb880fffcfac445fb99657b97c3c13d233f526e1bb7b5e6965efb1c4c81f35d0ac07e4ac02bb599f8405b8c0a51 WHIRLPOOL 7d73276645e7d2c4b0e9fdbff537f77709f39cf0b09ad381e22f973bf0090d4c65a01949502caa7542ad58f9e5836a24c4e736eeb8124c361b2284d15e432b9c
-MISC ChangeLog 15715 SHA256 98d7c35e36e48f2cdbf79d6747971a04e7f66f615798cd02e55130239f76a846 SHA512 cb0d77413d75a26a1626f1df31cbcce4d22001572f4716a53fb0c5716ad35404be4c2c459fd694bcba758311c804e0db7017da3478ea20282c96fd255a93df42 WHIRLPOOL 38574dc3195b8096e3a963557f187315fde1134643affe4c6ed756ec713f7b3cb5d36c9463078c756bf0528d62b6d1b617f3d03d623f03eb9fab47c76e6cbeb2
+EBUILD imaging-1.1.7-r4.ebuild 2449 SHA256 036712b6ab8c03f192cada16389c32c41e4c76057270de26ea6c9a4b4e2bf6b0 SHA512 d9ed8160eefc9e36ad7040d9f4c719134399252b4706edf723f5459c9bca2e504438e6114904b320653aa1b81efdfcc3f0dc272719d611a147b6997fc6dab080 WHIRLPOOL a12bc05a4913e85f315039130c4dd8b36a84f67bf0eb46db922d38f16fe25033ebacbefd1eb8c2aaca1f36235a6a720d252461d81ed5fd291f026a65412a5492
+MISC ChangeLog 15917 SHA256 0d523545d680c9d6690fbbfdfd72aaddbf59c024191b57381e9d0d0f2e8e5002 SHA512 66498467788959a4afdc45f08fb482d04ff530bb511760513f8d330db017518c52ebd6738e3c3bbf2832b6b5d7c4848de4d99fcbc043fca8acf5564f6bfd9a35 WHIRLPOOL 883cf064ba0fa60d44dbe5dd4bcf1159ee7acf077b753a61667580cd476cc0ae6ae3c844329e298bc340d8247dd20fcfe222b1554dc57563ab64236889c46a22
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJSKNKNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIA4P/0hJ43FoIBHiaRd1FIitZ3HB
-E5Y1CjU/jMs6lrfkmETOv3Ez5FfkuO2Mb0VOeDKgrt5gjDZwnhDC7aTQCspDBtcK
-O0NMt1Hr96mVb7bOWBMuxbE+oXMsOeSfr+HGI/8Z7V4avTPbtQK1N4AIcfHvmXWF
-/lIEvFBDJWqDlzxzeMhf4CimKke3tVtlP47w+Iivld/xjXwCVgdK4VCmaMZpyVg2
-PUhkA9K6bx/c3pPfx8oCuAt0plmLofPc/MBJ2m0kUjtZpXPGvJYDEwVhmf/q/I3w
-s3qrP0CPqTUMoKm2JQd9Bh/6fUNQgYqQGh5zybBFC3E+E0RmDhpkV825Lch/bAl7
-qT+Wg9R16IYofzx80Xkkn8tZi/NlS0uyNLyghzNp02ll0AxxSp5KThJI4XkgyP6T
-egkHQ42jkV+x0uIRc2PKc+JSshV3lPGSgjXCjNBCyhlBVeefWuw6EmOIKwnzxtts
-ev3TcXKBOqFVZTxLNW0Qc+6IuGkVo9eCoicHKgYDaxXRyHt6KhB+B5c+U868ZMpH
-VRHogGUhMb8UNsGIuahFf14k6uDwHrTp8pAmocxAMhoijrbwTU64nsX4AktNRpY8
-Sn+CDMgOamISypHqbO03RkH1ImlKAZ9LWKa4AOD/o49NDiXHb0c5Idf3lNFAMn3f
-DAjujJB9qnRfqFOvsj+C
-=hhSJ
+iQIcBAEBCAAGBQJT2EiYAAoJEPGu1DbS6WIAqw4P/jsN6Hznmjf3uVB38Wb5SEnO
+R1ziNpij9Zkvl82FRV9KkDj56xL4CiDxYMRQ1v1/5NK4MraI8i17F6VOeKrCrCiA
+o0p4YXO+zpPRkw7i/etkzTn1OZOXiSq4Qk+vvu222IGdTOk7B+B3ppqimTR5bg2i
+nKXv4c6xlG/XCZuaOAyjBfxOoyVZfyPq+YUANAqgjD6ms4fN3zuxUSRFWI7f/6fJ
+jabiH22+MOe/rBFcg4FwkgEsYTv+lUh3PeB52fN4heVldHBnma0dCQkJSzT85jfp
+qjB5PBDeOfBe1MUIRMD0OuwsGOn9DSM36mLfAfiX3xrTO2LN4tuUYGlVqzvz5/s5
+GyM7luyk2IjKQxZReksTQcdiHGZU+CMpKyCD4WKMJ1fnrObl9OBYgU3GBbHqIgcN
+vT40JcUoWwrGV11H0YSaoVQ0Mihyw/2FhJsKfwgfnBkByaYn+EOueywkm58t2R4M
+NobErY5yr6UMvOxWsopFOMa0P1bIb27MncN9+UZ4HjAJm4qj8iCXVoVloLUkYI8G
+IECVEvS7oV80B9TiX3uXA0tT7Ns43Cxj6D22ev0yaxjVCbaWOzZpkIFsi0SOas4L
+Lv6F5AAWxPadbvuJw9mQkseIJaJ7sxmoAYH43BduE6nEc+sM92SWOM3U+/0VC42m
+fr879FlZB3NM/3PsLFkN
+=RobI
 -----END PGP SIGNATURE-----
diff --git a/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch
new file mode 100644
index 000000000000..cdc068390387
--- /dev/null
+++ b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/508748
+
+fix building w/freetype-2.5.3
+
+patch by Jungshik Shin <jshin@chromium.org>
+
+--- Imaging-1.1.7/_imagingft.c
++++ Imaging-1.1.7/_imagingft.c
+@@ -70,7 +70,11 @@
+     const char* message;
+ } ft_errors[] =
+ 
++#if defined(USE_FREETYPE_2_1)
++#include FT_ERRORS_H
++#else
+ #include <freetype/fterrors.h>
++#endif
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */
diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild
index 59c6bbcd40e7..b3e8d5b517be 100644
--- a/dev-python/imaging/imaging-1.1.7-r4.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.3 2013/09/05 18:46:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.4 2014/07/30 01:21:21 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -41,6 +41,7 @@ python_prepare_all() {
 		"${FILESDIR}/${P}-sane.patch"
 		"${FILESDIR}/${P}-giftrans.patch"
 		"${FILESDIR}/${P}-missing-math.patch"
+		"${FILESDIR}/${P}-ft-header-include.patch"
 	)
 
 	# Add shebangs.