Fix build with freetype-2.5.1, bug 493548.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 38 insertions, 3 deletions

diff --git a/dev-python/pillow/ChangeLog b/dev-python/pillow/ChangeLog
index b5943ac26ce3..be97a38b126a 100644
--- a/dev-python/pillow/ChangeLog
+++ b/dev-python/pillow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pillow
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.12 2013/12/02 17:09:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.13 2013/12/08 22:50:18 floppym Exp $
+
+  08 Dec 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/pillow-freetype-2.5.1.patch, pillow-2.0.0-r1.ebuild,
+  pillow-2.1.0.ebuild:
+  Fix build with freetype-2.5.1, bug 493548.
 
   02 Dec 2013; Mike Gilbert <floppym@gentoo.org> pillow-2.1.0.ebuild:
   Drop unused test flag from IUSE.
diff --git a/dev-python/pillow/files/pillow-freetype-2.5.1.patch b/dev-python/pillow/files/pillow-freetype-2.5.1.patch
new file mode 100644
index 000000000000..5e949e4f241a
--- /dev/null
+++ b/dev-python/pillow/files/pillow-freetype-2.5.1.patch
@@ -0,0 +1,28 @@
+From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001
+From: Andrew Stromnov <stromnov@gmail.com>
+Date: Thu, 28 Nov 2013 16:58:43 +0400
+Subject: [PATCH] fix compiling with FreeType 2.5.1
+
+---
+ _imagingft.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/_imagingft.c b/_imagingft.c
+index 47d50bd..f19555b 100644
+--- a/_imagingft.c
++++ b/_imagingft.c
+@@ -59,7 +59,11 @@ struct {
+     const char* message;
+ } ft_errors[] =
+ 
++#if defined(USE_FREETYPE_2_1)
++#include FT_ERRORS_H
++#else
+ #include <freetype/fterrors.h>
++#endif
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */
+-- 
+1.8.5.1
+
diff --git a/dev-python/pillow/pillow-2.0.0-r1.ebuild b/dev-python/pillow/pillow-2.0.0-r1.ebuild
index 9129155a8be2..6a01e89e3f85 100644
--- a/dev-python/pillow/pillow-2.0.0-r1.ebuild
+++ b/dev-python/pillow/pillow-2.0.0-r1.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/dev-python/pillow/pillow-2.0.0-r1.ebuild,v 1.6 2013/10/22 08:57:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.0.0-r1.ebuild,v 1.7 2013/12/08 22:50:18 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -54,6 +54,7 @@ python_prepare_all() {
 		"${FILESDIR}/imaging-1.1.7-no-xv.patch"
 		"${FILESDIR}/pillow-2.0.0-delete_hardcoded_paths.patch"
 		"${FILESDIR}/pillow-2.0.0-libm_linking.patch"
+		"${FILESDIR}/pillow-freetype-2.5.1.patch"
 	)
 	epatch "${patches[@]}"
 
diff --git a/dev-python/pillow/pillow-2.1.0.ebuild b/dev-python/pillow/pillow-2.1.0.ebuild
index 83fc621b4cc6..e7c83f7edc5c 100644
--- a/dev-python/pillow/pillow-2.1.0.ebuild
+++ b/dev-python/pillow/pillow-2.1.0.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/dev-python/pillow/pillow-2.1.0.ebuild,v 1.4 2013/12/02 17:09:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.1.0.ebuild,v 1.5 2013/12/08 22:50:18 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -43,6 +43,7 @@ python_prepare_all() {
 	# Apply patches before executing sed.
 	local patches=(
 		"${FILESDIR}/imaging-1.1.7-no-xv.patch"
+		"${FILESDIR}/pillow-freetype-2.5.1.patch"
 	)
 	epatch "${patches[@]}"