4.2.0:

Doc: Clarified Image.save:append_images documentation
CI: Amazon Linux and Centos6 docker images added to TravisCI
Image.alpha_composite added
Complex Text Support
Added threshold parameter to ImageDraw.floodfill
Added dBATCH parameter to ghostscript command
JPEG: Adjust buffer size when icc_profile > MAXBLOCK
Specify Pillow Version in one place
CI: Change the owner of the TRAVIS_BUILD_DIR, fixing broken docker runs
Fix truncated PNG loading for some images, Fix memory leak on truncated PNG images.
Add decompression bomb check to Image.crop
ImageFile: Ensure that the err_code variable is initialized in case of exception.
Tiff: Support append_images for saving multipage TIFFs
Doc: Clarify that draft is only implemented for JPEG and PCD
Test: MicImagePlugin
Use round() instead of floor() to eliminate zero coefficients in resample
Remove deprecated code
Added append_images to PDF saving
Remove unused function core image function new_array
Remove unnecessary calls to dict.keys()
Add more ImageDraw.py tests and remove unused Draw.c code
Test: More tests for ImageMorph
Test: McIDAS area file
Update Feature Detection
CI: Update pypy on TravisCI
ImageMorph: Fix wrong expected size of MRLs read from disk
Docs: Update install docs for FreeBSD
Build: Ignore OpenJpeg 1.5 on FreeBSD
Remove 'not yet implemented' methods from PIL 1.1.4
Dependencies: Update FreeType to 2.8, LibTIFF to 4.0.8 and libimagequant to 2.9.1
Raise TypeError and not also UnboundLocalError in ImageFile.Parser()
Test: Use Codecov for coverage
Use PNG for Image.show()
Remove WITH_DEBUG compilation flag
Fix return value on parameter parse error in _webp.c
Set executable flag on scripts with shebang line
Flake8
Doc: Release Process Changes
CI: Added region for s3 deployment on appveyor
Doc: Updated references to point to existing files
Return copy on Image crop if crop dimensions match the image
Test: Optimize CI speed

4 files changed, 25 insertions, 29 deletions

diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index 68ebea3a38c..24bc97ee406 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2017/05/09 08:06:54 adam Exp $
+# $NetBSD: Makefile,v 1.35 2017/07/03 21:51:57 adam Exp $
 
-DISTNAME=	Pillow-4.1.1
+DISTNAME=	Pillow-4.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/Pillow/}
@@ -16,13 +16,6 @@ CONFLICTS+=	${PYPKGPREFIX}-imaging-[0-9]*
 
 DEPENDS+=	${PYPKGPREFIX}-olefile-*:../../devel/py-olefile
 
-# XXX: (automatically) testing Pillow fails because it is builded on a
-# separate directory (build/lib.*/PIL/). Manually cp(1) all the files to PIL/
-# fixes that (but implementing a similar distutils.cmd logic here can easily
-# leads to a buggy one). Disable the test for now.
-#do-test:
-#	${RUN}cd ${WRKSRC};${PKGSRC_SETENV} ${TEST_ENV} ${PYTHONBIN} selftest.py
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
diff --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST
index 44b4775c643..3c61fb5d135 100644
--- a/graphics/py-Pillow/PLIST
+++ b/graphics/py-Pillow/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.11 2017/01/29 12:46:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/07/03 21:51:57 adam Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/PIL/BdfFontFile.py
 ${PYSITELIB}/PIL/BdfFontFile.pyc
 ${PYSITELIB}/PIL/BdfFontFile.pyo
@@ -273,9 +279,6 @@ ${PYSITELIB}/PIL/_webp.so
 ${PYSITELIB}/PIL/features.py
 ${PYSITELIB}/PIL/features.pyc
 ${PYSITELIB}/PIL/features.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_INFODIR}/zip-safe
+${PYSITELIB}/PIL/version.py
+${PYSITELIB}/PIL/version.pyc
+${PYSITELIB}/PIL/version.pyo
diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo
index 0f728f8a778..ef57b956b50 100644
--- a/graphics/py-Pillow/distinfo
+++ b/graphics/py-Pillow/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2017/05/09 08:06:54 adam Exp $
+$NetBSD: distinfo,v 1.26 2017/07/03 21:51:57 adam Exp $
 
-SHA1 (Pillow-4.1.1.tar.gz) = 0e87a61cbe2c3e6b64b4215f8c40898dc5d9527d
-RMD160 (Pillow-4.1.1.tar.gz) = 19c14fd1587be134d20cafbecf5771ad313ad2d4
-SHA512 (Pillow-4.1.1.tar.gz) = 2cae5891268b0ae1644d7873342af1b40c8fd329d97d2e32ce9ea70cbf417387cd64cc21ee522f9be0ee857175f68924501a76125968bf78bd1990c544ad9a1f
-Size (Pillow-4.1.1.tar.gz) = 11327909 bytes
-SHA1 (patch-setup.py) = 8141b30b60baed8cda1ff13e7c5f1e06534a612e
+SHA1 (Pillow-4.2.0.tar.gz) = a12be40afaf16434d19c87552dc2100c76af1072
+RMD160 (Pillow-4.2.0.tar.gz) = 131335cf84bcb1c883caaebd3d969cc046fee17d
+SHA512 (Pillow-4.2.0.tar.gz) = 069bf031721b8bcc6acb74917f2ca5cc1b42724bbad9b693b6c0596d899f4cb23d650e0aa1d28f72a02c192fc7cade1a37ab0dae3153a324c770220a6045e181
+Size (Pillow-4.2.0.tar.gz) = 12673083 bytes
+SHA1 (patch-setup.py) = d53b9600c4b449f70c2ff8a85d059ebd74b0403c
diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py
index 57d5cde5969..434ce598e53 100644
--- a/graphics/py-Pillow/patches/patch-setup.py
+++ b/graphics/py-Pillow/patches/patch-setup.py
@@ -1,13 +1,13 @@
-$NetBSD: patch-setup.py,v 1.12 2017/05/09 08:06:54 adam Exp $
+$NetBSD: patch-setup.py,v 1.13 2017/07/03 21:51:57 adam Exp $
 
 Prevent to detect optional tkinter.
 Disable demo programs.
 
---- setup.py.orig	2017-04-28 16:48:58.000000000 +0000
+--- setup.py.orig	2017-07-01 15:55:53.000000000 +0000
 +++ setup.py
-@@ -95,11 +95,7 @@ def _read(file):
-         return fp.read()
- 
+@@ -104,11 +104,7 @@ def get_version():
+         exec(compile(f.read(), version_file, 'exec'))
+     return locals()['__version__']
  
 -try:
 -    import _tkinter
@@ -17,8 +17,8 @@ Disable demo programs.
 +_tkinter = None
  
  NAME = 'Pillow'
- PILLOW_VERSION = '4.1.1'
-@@ -736,7 +732,6 @@ try:
+ PILLOW_VERSION = get_version()
+@@ -768,7 +764,6 @@ try:
            ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
            include_package_data=True,
            packages=find_packages(),