summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
-rw-r--r--ftheaders.patch16
3 files changed, 31 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3fc92d2eae9..21420849f66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Dec 19 10:28:47 UTC 2015
+# Wed Feb 17 14:58:56 UTC 2016
pkgbase = python2-imaging
pkgdesc = PIL. Provides image processing capabilities for python
pkgver = 1.1.7
- pkgrel = 12
+ pkgrel = 13
url = http://www.pythonware.com/products/pil/index.htm
arch = i686
arch = x86_64
@@ -23,7 +23,9 @@ pkgbase = python2-imaging
conflicts = pil
replaces = pil
source = http://effbot.org/downloads/Imaging-1.1.7.tar.gz
+ source = ftheaders.patch
md5sums = fc14a54e1ce02a0225be8854bfba478e
+ md5sums = 8e38bfc967145c5467b57f40ceed63e7
pkgname = python2-imaging
diff --git a/PKGBUILD b/PKGBUILD
index c652d535929..b4b7df42023 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=python2-imaging
pkgver=1.1.7
-pkgrel=12
+pkgrel=13
pkgdesc="PIL. Provides image processing capabilities for python"
arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'armv6l')
url="http://www.pythonware.com/products/pil/index.htm"
@@ -21,8 +21,16 @@ optdepends=('tk: for the ImageTK module'
provides=("pil=${pkgver}")
conflicts=('pil')
replaces=('pil')
-source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
+source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz
+ ftheaders.patch)
+md5sums=('fc14a54e1ce02a0225be8854bfba478e'
+ '8e38bfc967145c5467b57f40ceed63e7')
+
+prepare() {
+ cd "${srcdir}/Imaging-${pkgver}"
+
+ patch -F 0 -N -p1 -i ../ftheaders.patch
+}
build() {
cd "${srcdir}/Imaging-${pkgver}"
diff --git a/ftheaders.patch b/ftheaders.patch
new file mode 100644
index 00000000000..adc050a4670
--- /dev/null
+++ b/ftheaders.patch
@@ -0,0 +1,16 @@
+--- Imaging-1.1.7/_imagingft.c.orig 2016-02-17 22:51:22.173689472 +0800
++++ Imaging-1.1.7/_imagingft.c 2016-02-17 22:53:45.743683886 +0800
+@@ -70,7 +70,13 @@
+ const char* message;
+ } ft_errors[] =
+
++#if defined(USE_FREETYPE_2_1)
++/* freetype 2.1 and newer */
++#include FT_ERRORS_H
++#else
++/* freetype 2.0 */
+ #include <freetype/fterrors.h>
++#endif
+
+ /* -------------------------------------------------------------------- */
+ /* font objects */