20854800 python imaging doesn't build on s12-71 s11-update
authorApril Chin <april.chin@oracle.com>
Tue, 21 Apr 2015 15:42:53 -0700
branchs11-update
changeset 4163 b088658aed2f
parent 4148 253ba4fb9749
child 4166 f7c991485826
20854800 python imaging doesn't build on s12-71
components/python/imaging/patches/03-imagingft_c.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/patches/03-imagingft_c.patch	Tue Apr 21 15:42:53 2015 -0700
@@ -0,0 +1,17 @@
+# This fix comes from the upstream Pillow fork of PIL:
+# https://github.com/python-pillow/Pillow/commit/c6040f618d8f2706a7b46d1cdf37d1a587f9701f
+
+--- Imaging-1.1.7-orig/_imagingft.c	2009-10-31 17:44:12.000000000 -0700
++++ Imaging-1.1.7/_imagingft.c	2015-04-09 08:30:10.889971000 -0700
+@@ -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 */