From b4411d9c91b575076e94acc449d881a4a8ce1f9879acffb4a2cc47ddaa2bc9f0 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Wed, 11 Dec 2013 20:09:11 +0000
Subject: [PATCH] Accepting request 210605 from
 openSUSE:Factory:Staging:freetype2

Added use-recommended-freetype-include.patch -- needed for freetype2 2.5.1

OBS-URL: https://build.opensuse.org/request/show/210605
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=6
---
 python-Pillow.changes                  |  8 ++++++++
 python-Pillow.spec                     |  4 ++++
 use-recommended-freetype-include.patch | 15 +++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 use-recommended-freetype-include.patch

diff --git a/python-Pillow.changes b/python-Pillow.changes
index b8c67be..367e658 100644
--- a/python-Pillow.changes
+++ b/python-Pillow.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec 11 20:08:40 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added use-recommended-freetype-include.patch -- Freetype upstream 
+  recommends using their macros together with ft2build include. 
+  Positive sideeffect is that this patch makes it build with both 
+  freetype2 2.5.1, and older version
+
 -------------------------------------------------------------------
 Mon Nov 18 09:07:13 UTC 2013 - speilicke@suse.com
 
diff --git a/python-Pillow.spec b/python-Pillow.spec
index 2f44cb2..25d437f 100644
--- a/python-Pillow.spec
+++ b/python-Pillow.spec
@@ -24,6 +24,9 @@ License:        HPND
 Group:          Development/Languages/Python
 Url:            http://python-imaging.github.io/
 Source:         https://pypi.python.org/packages/source/P/Pillow/Pillow-%{version}.zip
+# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
+# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
+Patch0:         use-recommended-freetype-include.patch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-tk
@@ -74,6 +77,7 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 
 %prep
 %setup -q -n Pillow-%{version}
+%patch0 -p1
 
 %build
 CFLAGS="%{optflags}" python setup.py build
diff --git a/use-recommended-freetype-include.patch b/use-recommended-freetype-include.patch
new file mode 100644
index 0000000..eca6bb5
--- /dev/null
+++ b/use-recommended-freetype-include.patch
@@ -0,0 +1,15 @@
+diff -Naur Pillow-2.2.1.orig/_imagingft.c Pillow-2.2.1/_imagingft.c
+--- Pillow-2.2.1.orig/_imagingft.c	2013-10-02 12:58:22.000000000 +0200
++++ Pillow-2.2.1/_imagingft.c	2013-12-11 21:07:17.433282578 +0100
+@@ -59,7 +59,11 @@
+     const char* message;
+ } ft_errors[] =
+ 
++#if defined(USE_FREETYPE_2_1)
++#include FT_ERRORS_H
++#else
+ #include <freetype/fterrors.h>
++#endif
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */