From 7904417ae5ebe3de5933a27cd0c351c1419c2b61 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Fri, 17 Apr 2015 15:10:02 +0000
Subject: Changes 2.8.1: - Bug fix: Catch struct.error on invalid JPEG

---
 graphics/py-Pillow/Makefile               |  4 ++--
 graphics/py-Pillow/distinfo               | 10 +++++-----
 graphics/py-Pillow/patches/patch-setup.py | 11 +++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'graphics/py-Pillow')

diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index daeaf4629fd..536879f629f 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2015/03/15 19:57:40 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/17 15:10:02 adam Exp $
 
-DISTNAME=	Pillow-2.7.0
+DISTNAME=	Pillow-2.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
 MASTER_SITES=	https://pypi.python.org/packages/source/P/Pillow/
diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo
index ceaee31b67e..61b0e558e1c 100644
--- a/graphics/py-Pillow/distinfo
+++ b/graphics/py-Pillow/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2015/01/03 15:46:00 adam Exp $
+$NetBSD: distinfo,v 1.11 2015/04/17 15:10:02 adam Exp $
 
-SHA1 (Pillow-2.7.0.zip) = 1aef8787cf05bae11899d391709cbc44e796251d
-RMD160 (Pillow-2.7.0.zip) = 3a9f62e4d32a5f518e853c87884a4a9e39e98346
-Size (Pillow-2.7.0.zip) = 7597159 bytes
-SHA1 (patch-setup.py) = 1e60096e3a00613a6fd114e2f658a9689eb78844
+SHA1 (Pillow-2.8.1.zip) = 66ac3f0d57d12392fc38d39334a58bee187b4635
+RMD160 (Pillow-2.8.1.zip) = 034bf5ea66ed7482383af5eceaa5e315b874e3cf
+Size (Pillow-2.8.1.zip) = 9275663 bytes
+SHA1 (patch-setup.py) = f3f3d39906314f2ef925547ce634cb226d520ef5
diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py
index 3e0e5b09a1e..6802741b589 100644
--- a/graphics/py-Pillow/patches/patch-setup.py
+++ b/graphics/py-Pillow/patches/patch-setup.py
@@ -1,9 +1,9 @@
-$NetBSD: patch-setup.py,v 1.3 2014/07/06 12:15:53 obache Exp $
+$NetBSD: patch-setup.py,v 1.4 2015/04/17 15:10:02 adam Exp $
 
 * Prevent to detect optional tkinter.
 * Disable demo programs.
 
---- setup.py.orig	2014-06-30 22:42:26.000000000 +0000
+--- setup.py.orig	2015-04-02 09:05:22.000000000 +0000
 +++ setup.py
 @@ -82,11 +82,7 @@ def _lib_include(root):
  def _read(file):
@@ -18,7 +18,7 @@ $NetBSD: patch-setup.py,v 1.3 2014/07/06 12:15:53 obache Exp $
  
  
  NAME = 'Pillow'
-@@ -570,7 +566,7 @@ class pil_build_ext(build_ext):
+@@ -575,7 +571,7 @@ class pil_build_ext(build_ext):
              exts.append(Extension(
                  "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
  
@@ -27,12 +27,11 @@ $NetBSD: patch-setup.py,v 1.3 2014/07/06 12:15:53 obache Exp $
              # locate Tcl/Tk frameworks
              frameworks = []
              framework_roots = [
-@@ -746,7 +742,7 @@ setup(
+@@ -753,7 +749,6 @@ setup(
      ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
      include_package_data=True,
      packages=find_packages(),
 -    scripts=glob.glob("Scripts/pil*.py"),
-+#    scripts=glob.glob("Scripts/pil*.py"),
-     test_suite='PIL.tests',
+     test_suite='nose.collector',
      keywords=["Imaging", ],
      license='Standard PIL License',
-- 
cgit v1.2.3