pool/python-Pillow
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 210605 from openSUSE:Factory:Staging:freetype2

Browse Source 
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
This commit is contained in:
Denisart Benjamin 2013-12-11 20:09:11 +00:00 committed by Git OBS Bridge
parent 7f9ea1b9ed
commit b4411d9c91
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python-Pillow.changes
View File

@ -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 Mon Nov 18 09:07:13 UTC 2013 - speilicke@suse.com

4
python-Pillow.spec
View File

@ -24,6 +24,9 @@ License: HPND
Group: Development/Languages/Python Group: Development/Languages/Python
Url: http://python-imaging.github.io/ Url: http://python-imaging.github.io/
Source: https://pypi.python.org/packages/source/P/Pillow/Pillow-%{version}.zip 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-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
BuildRequires: python-tk BuildRequires: python-tk
@ -74,6 +77,7 @@ Python Imaging Library by Fredrik Lundh and Contributors.
%prep %prep
%setup -q -n Pillow-%{version} %setup -q -n Pillow-%{version}
%patch0 -p1
%build %build
CFLAGS="%{optflags}" python setup.py build CFLAGS="%{optflags}" python setup.py build

15
use-recommended-freetype-include.patch Normal file
View File

@ -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 */