Fri Apr 17 15:10:02 2015 UTC ()
Changes 2.8.1:
- Bug fix: Catch struct.error on invalid JPEG


(adam)
diff -r1.17 -r1.18 pkgsrc/graphics/py-Pillow/Makefile
diff -r1.10 -r1.11 pkgsrc/graphics/py-Pillow/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/py-Pillow/patches/patch-setup.py
cvs diff -r1.17 -r1.18 pkgsrc/graphics/py-Pillow/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-Pillow/Makefile 2015/03/15 19:57:40 1.17
+++ pkgsrc/graphics/py-Pillow/Makefile 2015/04/17 15:10:02 1.18
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.17 2015/03/15 19:57:40 hiramatsu Exp $ 1# $NetBSD: Makefile,v 1.18 2015/04/17 15:10:02 adam Exp $
2 2
3DISTNAME= Pillow-2.7.0 3DISTNAME= Pillow-2.8.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= graphics python 5CATEGORIES= graphics python
6MASTER_SITES= https://pypi.python.org/packages/source/P/Pillow/ 6MASTER_SITES= https://pypi.python.org/packages/source/P/Pillow/
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://python-pillow.github.io/ 10HOMEPAGE= http://python-pillow.github.io/
11COMMENT= Python Imaging Library (Fork) 11COMMENT= Python Imaging Library (Fork)
12 12
13CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* 13CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]*
14 14
15SUBST_CLASSES+= fix-path 15SUBST_CLASSES+= fix-path
16SUBST_MESSAGE.fix-path= Fixing paths. 16SUBST_MESSAGE.fix-path= Fixing paths.
cvs diff -r1.10 -r1.11 pkgsrc/graphics/py-Pillow/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/py-Pillow/distinfo 2015/01/03 15:46:00 1.10
+++ pkgsrc/graphics/py-Pillow/distinfo 2015/04/17 15:10:02 1.11
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.10 2015/01/03 15:46:00 adam Exp $ 1$NetBSD: distinfo,v 1.11 2015/04/17 15:10:02 adam Exp $
2 2
3SHA1 (Pillow-2.7.0.zip) = 1aef8787cf05bae11899d391709cbc44e796251d 3SHA1 (Pillow-2.8.1.zip) = 66ac3f0d57d12392fc38d39334a58bee187b4635
4RMD160 (Pillow-2.7.0.zip) = 3a9f62e4d32a5f518e853c87884a4a9e39e98346 4RMD160 (Pillow-2.8.1.zip) = 034bf5ea66ed7482383af5eceaa5e315b874e3cf
5Size (Pillow-2.7.0.zip) = 7597159 bytes 5Size (Pillow-2.8.1.zip) = 9275663 bytes
6SHA1 (patch-setup.py) = 1e60096e3a00613a6fd114e2f658a9689eb78844 6SHA1 (patch-setup.py) = f3f3d39906314f2ef925547ce634cb226d520ef5
cvs diff -r1.3 -r1.4 pkgsrc/graphics/py-Pillow/patches/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/graphics/py-Pillow/patches/patch-setup.py 2014/07/06 12:15:53 1.3
+++ pkgsrc/graphics/py-Pillow/patches/patch-setup.py 2015/04/17 15:10:02 1.4
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1$NetBSD: patch-setup.py,v 1.3 2014/07/06 12:15:53 obache Exp $ 1$NetBSD: patch-setup.py,v 1.4 2015/04/17 15:10:02 adam Exp $
2 2
3* Prevent to detect optional tkinter. 3* Prevent to detect optional tkinter.
4* Disable demo programs. 4* Disable demo programs.
5 5
6--- setup.py.orig 2014-06-30 22:42:26.000000000 +0000 6--- setup.py.orig 2015-04-02 09:05:22.000000000 +0000
7+++ setup.py 7+++ setup.py
8@@ -82,11 +82,7 @@ def _lib_include(root): 8@@ -82,11 +82,7 @@ def _lib_include(root):
9 def _read(file): 9 def _read(file):
10 return open(file, 'rb').read() 10 return open(file, 'rb').read()
11  11
12-try: 12-try:
13- import _tkinter 13- import _tkinter
14-except (ImportError, OSError): 14-except (ImportError, OSError):
15- # pypy emits an oserror 15- # pypy emits an oserror
16- _tkinter = None 16- _tkinter = None
17+_tkinter = None 17+_tkinter = None
18  18
19  19
20 NAME = 'Pillow' 20 NAME = 'Pillow'
21@@ -570,7 +566,7 @@ class pil_build_ext(build_ext): 21@@ -575,7 +571,7 @@ class pil_build_ext(build_ext):
22 exts.append(Extension( 22 exts.append(Extension(
23 "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs)) 23 "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
24  24
25- if sys.platform == "darwin": 25- if sys.platform == "darwin":
26+ if _tkinter and sys.platform == "darwin": 26+ if _tkinter and sys.platform == "darwin":
27 # locate Tcl/Tk frameworks 27 # locate Tcl/Tk frameworks
28 frameworks = [] 28 frameworks = []
29 framework_roots = [ 29 framework_roots = [
30@@ -746,7 +742,7 @@ setup( 30@@ -753,7 +749,6 @@ setup(
31 ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], 31 ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
32 include_package_data=True, 32 include_package_data=True,
33 packages=find_packages(), 33 packages=find_packages(),
34- scripts=glob.glob("Scripts/pil*.py"), 34- scripts=glob.glob("Scripts/pil*.py"),
35+# scripts=glob.glob("Scripts/pil*.py"), 35 test_suite='nose.collector',
36 test_suite='PIL.tests', 
37 keywords=["Imaging", ], 36 keywords=["Imaging", ],
38 license='Standard PIL License', 37 license='Standard PIL License',