--- a/components/python/imaging/Makefile	Thu Apr 09 16:20:21 2015 -0500
+++ b/components/python/imaging/Makefile	Fri Apr 10 11:48:05 2015 -0700
@@ -51,6 +51,14 @@
 COMPONENT_TEST_ARGS= ./selftest.py
 COMPONENT_TEST_ENV= PYTHONPATH=$(TEST_PYTHONPATH.$(BITS))
 
+# Master test results are the same for both 32-bit and 64-bit, 
+# for all versions of Python, so override
+# here, rather than create multiple identical master files.
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "s|\(^Binary modules loaded from \).*|\1|" '
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/patches/03-imagingft_c.patch	Fri Apr 10 11:48:05 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 */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/test/results-all.master	Fri Apr 10 11:48:05 2015 -0700
@@ -0,0 +1,15 @@
+--------------------------------------------------------------------
+PIL 1.1.7 TEST SUMMARY 
+--------------------------------------------------------------------
+Python modules loaded from ./PIL
+Binary modules loaded from 
+--------------------------------------------------------------------
+*** PIL CORE support not installed
+*** TKINTER support not installed
+--- JPEG support ok
+--- ZLIB (PNG/ZIP) support ok
+*** FREETYPE2 support not installed
+*** LITTLECMS support not installed
+--------------------------------------------------------------------
+Running selftest:
+--- 57 tests passed.