diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-17 12:53:17 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-17 12:53:17 +0100 |
| commit | b7c0fc1630ee109f60322d37067e92e5c40f434c (patch) | |
| tree | 73b450b2b736e325a38d9c26258ffadb538eb922 /patches/Imaging-1.1.7 | |
| parent | d5013ee2b0d7e08a486a1ccd50c69f3a0bb5b8ff (diff) | |
| download | ptxdist-b7c0fc1630ee109f60322d37067e92e5c40f434c.tar.gz ptxdist-b7c0fc1630ee109f60322d37067e92e5c40f434c.tar.xz | |
python-imaging: fix building with FreeType 2.5.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/Imaging-1.1.7')
3 files changed, 29 insertions, 6 deletions
diff --git a/patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch b/patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch index 6345e2f48..f322445cd 100644 --- a/patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch +++ b/patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch @@ -7,8 +7,8 @@ This patch is probably not acceptable in upstream. Forwarded: not-needed Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - setup.py | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) + setup.py | 8 -------- + 1 file changed, 8 deletions(-) diff --git a/setup.py b/setup.py index 5d4d53a..26d5672 100644 @@ -36,6 +36,3 @@ index 5d4d53a..26d5672 100644 # # insert new dirs *before* default libs, to avoid conflicts # between Python PYD stub libs and real libraries --- -1.7.5.1 - diff --git a/patches/Imaging-1.1.7/0002-fix-compiling-with-FreeType-2.5.1.patch b/patches/Imaging-1.1.7/0002-fix-compiling-with-FreeType-2.5.1.patch new file mode 100644 index 000000000..ef5f2649b --- /dev/null +++ b/patches/Imaging-1.1.7/0002-fix-compiling-with-FreeType-2.5.1.patch @@ -0,0 +1,24 @@ +From: Andrew Stromnov <stromnov@gmail.com> +Date: Thu, 28 Nov 2013 16:58:43 +0400 +Subject: [PATCH] fix compiling with FreeType 2.5.1 + +--- + _imagingft.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/_imagingft.c b/_imagingft.c +index 9358087..3ab1cbe 100644 +--- a/_imagingft.c ++++ b/_imagingft.c +@@ -70,7 +70,11 @@ struct { + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++#include FT_ERRORS_H ++#else + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/patches/Imaging-1.1.7/series b/patches/Imaging-1.1.7/series index bfe5bcd05..852e106f2 100644 --- a/patches/Imaging-1.1.7/series +++ b/patches/Imaging-1.1.7/series @@ -1,3 +1,5 @@ # generated by git-ptx-patches +#tag:base --start-number 1 0001-setup.py-remove-host-directories-from-search-paths.patch -# d1e428f451e5d4fce235256d18430c0c - git-ptx-patches magic +0002-fix-compiling-with-FreeType-2.5.1.patch +# 02e3c3fc00cd9d7bba8253fd4c3e7b5a - git-ptx-patches magic |