Hello community,

here is the log from the commit of package python-Pillow for openSUSE:Factory 
checked in at 2013-12-12 11:24:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Pillow (Old)
 and      /work/SRC/openSUSE:Factory/.python-Pillow.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-Pillow"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Pillow/python-Pillow.changes      
2013-12-04 13:12:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-Pillow.new/python-Pillow.changes 
2013-12-12 11:24:12.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 11 20:08:40 UTC 2013 - [email protected]
+
+- 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
+
+-------------------------------------------------------------------

New:
----
  use-recommended-freetype-include.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-Pillow.spec ++++++
--- /var/tmp/diff_new_pack.s4gOnC/_old  2013-12-12 11:24:12.000000000 +0100
+++ /var/tmp/diff_new_pack.s4gOnC/_new  2013-12-12 11:24:12.000000000 +0100
@@ -24,6 +24,9 @@
 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 @@
 
 %prep
 %setup -q -n Pillow-%{version}
+%patch0 -p1
 
 %build
 CFLAGS="%{optflags}" python setup.py build


++++++ use-recommended-freetype-include.patch ++++++
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 */
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to