[126022] trunk/dports/python/py-Pillow

[stromnov at macports.org]

Revision: 126022
          https://trac.macports.org/changeset/126022
Author:   stromnov at macports.org
Date:     2014-10-02 00:45:04 -0700 (Thu, 02 Oct 2014)
Log Message:
-----------
py-Pillow: fix issue with tkimaging (#45240)

Modified Paths:
--------------
    trunk/dports/python/py-Pillow/Portfile
    trunk/dports/python/py-Pillow/files/patch-setup.py.diff

Modified: trunk/dports/python/py-Pillow/Portfile
===================================================================
--- trunk/dports/python/py-Pillow/Portfile	2014-10-02 05:59:21 UTC (rev 126021)
+++ trunk/dports/python/py-Pillow/Portfile	2014-10-02 07:45:04 UTC (rev 126022)
@@ -6,7 +6,7 @@
 
 name                py-Pillow
 version             2.6.0
-revision            0
+revision            1
 categories-append   devel
 platforms           darwin
 license             BSD

Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-Pillow/files/patch-setup.py.diff	2014-10-02 05:59:21 UTC (rev 126021)
+++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff	2014-10-02 07:45:04 UTC (rev 126022)
@@ -1,5 +1,5 @@
 --- setup.py.orig	2014-10-01 23:17:03.000000000 +0400
-+++ setup.py	2014-10-01 23:22:23.000000000 +0400
++++ setup.py	2014-10-02 11:11:20.000000000 +0400
 @@ -200,44 +200,8 @@
                  "/usr/lib", "python%s" % sys.version[:3], "config"))
  
@@ -69,7 +69,7 @@
          # on Windows, look for the OpenJPEG libraries in the location that
          # the official installer puts them
          if sys.platform == "win32":
-@@ -575,28 +524,6 @@
+@@ -575,29 +524,7 @@
              exts.append(Extension(
                  "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
  
@@ -95,6 +95,8 @@
 -                    "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
 -                    extra_compile_args=frameworks, extra_link_args=frameworks))
 -                feature.tcl = feature.tk = 1  # mark as present
-         elif feature.tcl and feature.tk:
+-        elif feature.tcl and feature.tk:
++        if feature.tcl and feature.tk:
              exts.append(Extension(
                  "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+                 libraries=[feature.tcl, feature.tk]))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141002/eea79914/attachment.html>