<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121715] trunk/dports/python/py-Pillow</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121715">121715</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2014-07-04 16:04:28 -0700 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-Pillow: update to version 2.5.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyPillowPortfile">trunk/dports/python/py-Pillow/Portfile</a></li>
<li><a href="#trunkdportspythonpyPillowfilespatchsetuppydiff">trunk/dports/python/py-Pillow/files/patch-setup.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyPillowPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-Pillow/Portfile (121714 => 121715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-Pillow/Portfile        2014-07-04 22:54:25 UTC (rev 121714)
+++ trunk/dports/python/py-Pillow/Portfile        2014-07-04 23:04:28 UTC (rev 121715)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><span class="cx"> name py-Pillow
</span><del>-version 2.4.0
-revision 1
</del><ins>+version 2.5.0
+revision 0
</ins><span class="cx"> categories-append devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="lines">@@ -24,13 +24,13 @@
</span><span class="cx">
</span><span class="cx"> distname Pillow-${version}
</span><span class="cx">
</span><del>-checksums rmd160 2692fee280a9abc595ebbb8df6d6a73f5c83667a \
- sha256 2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a
</del><ins>+checksums rmd160 d962dbf1664b3c21a68ee82b2d7da9c0a9489e55 \
+ sha256 32776f3782d5321dc2720a7cc01497c47ffa4d0e07e7f762d8d9bc2d4e2e9d95
</ins><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> use_zip yes
</span><span class="cx">
</span><del>- conflicts py${python.version}-pil
</del><ins>+ conflicts py${python.version}-pil
</ins><span class="cx">
</span><span class="cx"> depends_build port:py${python.version}-setuptools
</span><span class="cx"> depends_lib-append port:py${python.version}-tkinter \
</span><span class="lines">@@ -48,8 +48,6 @@
</span><span class="cx"> reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #build.args-append --enable-zlib
-
</del><span class="cx"> livecheck.type none
</span><span class="cx"> } else {
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportspythonpyPillowfilespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff (121714 => 121715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-Pillow/files/patch-setup.py.diff        2014-07-04 22:54:25 UTC (rev 121714)
+++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff        2014-07-04 23:04:28 UTC (rev 121715)
</span><span class="lines">@@ -1,6 +1,15 @@
</span><del>---- setup.py.orig        2014-04-01 18:21:44.000000000 +0400
-+++ setup.py        2014-04-02 12:16:12.000000000 +0400
-@@ -196,34 +196,8 @@
</del><ins>+--- setup.py.orig        2014-07-04 17:25:36.000000000 +0200
++++ setup.py        2014-07-04 17:33:05.000000000 +0200
+@@ -19,7 +19,7 @@
+ from setuptools import Extension, setup, find_packages
+
+ # monkey patch import hook. Even though flake8 says it's not used, it is.
+-# comment this out to disable multi threaded builds.
++# comment this out to disable multi threaded builds.
+ import mp_compile
+
+ _IMAGING = (
+@@ -200,44 +200,8 @@
</ins><span class="cx"> "/usr/lib", "python%s" % sys.version[:3], "config"))
</span><span class="cx">
</span><span class="cx"> elif sys.platform == "darwin":
</span><span class="lines">@@ -13,31 +22,41 @@
</span><span class="cx"> - # darwin ports installation directories
</span><span class="cx"> - _add_directory(library_dirs, "/opt/local/lib")
</span><span class="cx"> - _add_directory(include_dirs, "/opt/local/include")
</span><del>--
-- # if homebrew is installed, use its lib and include directories
</del><ins>+-
+- # if Homebrew is installed, use its lib and include directories
</ins><span class="cx"> - import subprocess
</span><span class="cx"> - try:
</span><del>-- prefix = subprocess.check_output(['brew', '--prefix'])
-- if prefix:
-- prefix = prefix.strip()
-- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
-- _add_directory(include_dirs, os.path.join(prefix, 'include'))
--
-- # freetype2 is a key-only brew under opt/
-- _add_directory(library_dirs, os.path.join(prefix, 'opt', 'freetype', 'lib'))
-- _add_directory(include_dirs, os.path.join(prefix, 'opt', 'freetype', 'include'))
</del><ins>+- prefix = subprocess.check_output(
+- ['brew', '--prefix']
+- ).strip().decode('latin1')
</ins><span class="cx"> - except:
</span><del>-- pass # homebrew not installed
--
-- # freetype2 ships with X11 (after homebrew, so that homebrew freetype is preferred)
-- _add_directory(library_dirs, "/usr/X11/lib")
-- _add_directory(include_dirs, "/usr/X11/include")
</del><ins>+- # Homebrew not installed
+- prefix = None
+-
+- ft_prefix = None
+-
+- if prefix:
+- # add Homebrew's include and lib directories
+- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
+- _add_directory(include_dirs, os.path.join(prefix, 'include'))
+- ft_prefix = os.path.join(prefix, 'opt', 'freetype')
+-
+- if ft_prefix and os.path.isdir(ft_prefix):
+- # freetype might not be linked into Homebrew's prefix
+- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
+- _add_directory(
+- include_dirs, os.path.join(ft_prefix, 'include'))
+- else:
+- # fall back to freetype from XQuartz if
+- # Homebrew's freetype is missing
+- _add_directory(library_dirs, "/usr/X11/lib")
+- _add_directory(include_dirs, "/usr/X11/include")
</ins><span class="cx"> + _add_directory(library_dirs, "@prefix@/lib")
</span><span class="cx"> + _add_directory(include_dirs, "@prefix@/include")
</span><span class="cx">
</span><span class="cx"> elif sys.platform.startswith("linux"):
</span><span class="cx"> arch_tp = (plat.processor(), plat.architecture()[0])
</span><del>-@@ -315,21 +289,6 @@
</del><ins>+@@ -337,21 +301,6 @@
</ins><span class="cx"> else:
</span><span class="cx"> TCL_ROOT = None
</span><span class="cx">
</span><span class="lines">@@ -57,9 +76,18 @@
</span><span class="cx"> - _add_directory(include_dirs, "/usr/include")
</span><span class="cx"> -
</span><span class="cx"> # on Windows, look for the OpenJPEG libraries in the location that
</span><del>- # the official installed puts them
</del><ins>+ # the official installer puts them
</ins><span class="cx"> if sys.platform == "win32":
</span><del>-@@ -507,29 +466,7 @@
</del><ins>+@@ -410,7 +359,7 @@
+ for directory in self.compiler.include_dirs:
+ try:
+ listdir = os.listdir(directory)
+- except Exception:
++ except Exception:
+ # WindowsError, FileNotFoundError
+ continue
+ for name in listdir:
+@@ -570,29 +519,7 @@
</ins><span class="cx"> exts.append(Extension(
</span><span class="cx"> "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>