Hello community,

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

Package is "python-imaging"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-imaging/python-imaging.changes    
2013-03-01 08:03:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-imaging.new/python-imaging.changes       
2013-12-12 11:23:56.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 11 19:59:16 UTC 2013 - hrvoje.sen...@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
+
+-------------------------------------------------------------------

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

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

Other differences:
------------------
++++++ python-imaging.spec ++++++
--- /var/tmp/diff_new_pack.VuMoUo/_old  2013-12-12 11:23:57.000000000 +0100
+++ /var/tmp/diff_new_pack.VuMoUo/_new  2013-12-12 11:23:57.000000000 +0100
@@ -58,6 +58,9 @@
 Source1:        pil-handbook.pdf
 Patch2:         Imaging-1.1.7-64bit.patch
 Patch3:         Imaging-1.1.7-ssize.patch
+# 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
+Patch4:         use-recommended-freetype-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -92,6 +95,7 @@
 %setup -n Imaging-%{version}
 %patch2
 %patch3
+%patch4 -p1
 cp %{S:1} .
 
 %build

++++++ use-recommended-freetype-include.patch ++++++
diff -Naur Imaging-1.1.7.orig/_imagingft.c Imaging-1.1.7/_imagingft.c
--- Imaging-1.1.7.orig/_imagingft.c     2009-11-01 01:44:12.000000000 +0100
+++ Imaging-1.1.7/_imagingft.c  2013-12-11 20:55:49.888878066 +0100
@@ -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 */
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to