From 26f028afb1ecb6e1633ae1258c881df7fb44a167 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Fri, 23 May 2014 11:21:37 -0700
Subject: [PATCH] Patch PIL to build with Freetype2

---
 mac/Imaging-Freetype2.patch | 27 +++++++++++++++++++++++++++
 mac/gramps.modules          |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 mac/Imaging-Freetype2.patch

diff --git a/mac/Imaging-Freetype2.patch b/mac/Imaging-Freetype2.patch
new file mode 100644
index 000000000..564253f2a
--- /dev/null
+++ b/mac/Imaging-Freetype2.patch
@@ -0,0 +1,27 @@
+*** a/_imagingft.c	Sat Oct 31 17:44:12 2009
+--- b/_imagingft.c	Thu May 22 12:30:02 2014
+***************
+*** 70,76 ****
+--- 70,80 ----
+      const char* message;
+  } ft_errors[] =
+  
++ #if defined(USE_FREETYPE_2_1)
++ #include <freetype2/fterrors.h>
++ #else
+  #include <freetype/fterrors.h>
++ #endif
+  
+  /* -------------------------------------------------------------------- */
+  /* font objects */
+--- a/setup.py	Sun Nov 15 08:06:10 2009
++++ b/setup.py	Fri May 23 11:26:20 2014
+@@ -348,7 +348,7 @@
+                     dir = os.path.join(root, "Tk.framework", "Headers")
+                     add_directory(self.compiler.include_dirs, dir, 1)
+                     break
+-            if frameworks:
++            if False:
+                 exts.append(Extension(
+                     "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+                     extra_compile_args=frameworks, extra_link_args=frameworks
diff --git a/mac/gramps.modules b/mac/gramps.modules
index cc34401a8..64d148f90 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -147,7 +147,9 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </autotools>
 
   <distutils id="pil">
-    <branch module="Imaging-1.1.7.tar.gz" version="1.1.7" repo="pythonware"/>
+    <branch module="Imaging-1.1.7.tar.gz" version="1.1.7" repo="pythonware">
+      <patch file="Imaging-Freetype2.patch" strip="1"/>
+    </branch>
   </distutils>
 
  <distutils id='pyicu'>