<!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>[147383] 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/147383">147383</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2016-04-02 14:54:41 -0700 (Sat, 02 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-Pillow: update to version 3.2.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 (147382 => 147383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-Pillow/Portfile        2016-04-02 21:42:43 UTC (rev 147382)
+++ trunk/dports/python/py-Pillow/Portfile        2016-04-02 21:54:41 UTC (rev 147383)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><span class="cx"> name py-Pillow
</span><del>-version 3.1.1
</del><ins>+version 3.2.0
</ins><span class="cx"> revision 0
</span><span class="cx"> categories-append devel
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx">
</span><span class="cx"> distname Pillow-${version}
</span><span class="cx">
</span><del>-checksums rmd160 4825d86f16fd073583e19eaef473af83340d4c06 \
- sha256 486f4ccddee09429cb1c63ea56c02894aecf9d69acdcaf006c53835df2549fff
</del><ins>+checksums rmd160 939da559db631891347adbeb27c81b531b9dd602 \
+ sha256 64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a
</ins><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> conflicts py${python.version}-pil
</span></span></pre></div>
<a id="trunkdportspythonpyPillowfilespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff (147382 => 147383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-Pillow/files/patch-setup.py.diff        2016-04-02 21:42:43 UTC (rev 147382)
+++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff        2016-04-02 21:54:41 UTC (rev 147383)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>---- setup.py.orig        2015-10-01 18:27:21.000000000 +0300
-+++ setup.py        2015-10-04 23:38:00.000000000 +0300
-@@ -201,44 +201,8 @@
- "/usr/lib", "python%s" % sys.version[:3], "config"))
</del><ins>+--- setup.py.orig        2016-04-01 16:10:57.000000000 +0300
++++ setup.py        2016-04-03 00:45:49.000000000 +0300
+@@ -197,43 +197,9 @@
+ sys.version[:3], "config"))
</ins><span class="cx">
</span><span class="cx"> elif sys.platform == "darwin":
</span><span class="cx"> - # attempt to make sure we pick freetype2 over other versions
</span><span class="lines">@@ -10,16 +10,15 @@
</span><span class="cx"> - # fink installation directories
</span><span class="cx"> - _add_directory(library_dirs, "/sw/lib")
</span><span class="cx"> - _add_directory(include_dirs, "/sw/include")
</span><del>-- # darwin ports installation directories
</del><ins>+ # darwin ports installation directories
</ins><span class="cx"> - _add_directory(library_dirs, "/opt/local/lib")
</span><span class="cx"> - _add_directory(include_dirs, "/opt/local/include")
</span><span class="cx"> -
</span><span class="cx"> - # if Homebrew is installed, use its lib and include directories
</span><span class="cx"> - import subprocess
</span><span class="cx"> - try:
</span><del>-- prefix = subprocess.check_output(
-- ['brew', '--prefix']
-- ).strip().decode('latin1')
</del><ins>+- prefix = subprocess.check_output(['brew', '--prefix']).strip(
+- ).decode('latin1')
</ins><span class="cx"> - except:
</span><span class="cx"> - # Homebrew not installed
</span><span class="cx"> - prefix = None
</span><span class="lines">@@ -35,8 +34,8 @@
</span><span class="cx"> - if ft_prefix and os.path.isdir(ft_prefix):
</span><span class="cx"> - # freetype might not be linked into Homebrew's prefix
</span><span class="cx"> - _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
</span><del>-- _add_directory(
-- include_dirs, os.path.join(ft_prefix, 'include'))
</del><ins>+- _add_directory(include_dirs,
+- os.path.join(ft_prefix, 'include'))
</ins><span class="cx"> - else:
</span><span class="cx"> - # fall back to freetype from XQuartz if
</span><span class="cx"> - # Homebrew's freetype is missing
</span><span class="lines">@@ -47,7 +46,7 @@
</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>-@@ -341,21 +305,6 @@
</del><ins>+@@ -343,21 +309,6 @@
</ins><span class="cx"> else:
</span><span class="cx"> TCL_ROOT = None
</span><span class="cx">
</span><span class="lines">@@ -69,16 +68,16 @@
</span><span class="cx"> # on Windows, look for the OpenJPEG libraries in the location that
</span><span class="cx"> # the official installer puts them
</span><span class="cx"> if sys.platform == "win32":
</span><del>-@@ -580,32 +529,9 @@
- "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
</del><ins>+@@ -580,32 +531,9 @@
+ define_macros=defs))
</ins><span class="cx">
</span><span class="cx"> if feature.tcl and feature.tk:
</span><span class="cx"> - if sys.platform == "darwin":
</span><span class="cx"> - # locate Tcl/Tk frameworks
</span><span class="cx"> - frameworks = []
</span><span class="cx"> - framework_roots = [
</span><del>-- "/Library/Frameworks",
-- "/System/Library/Frameworks"]
</del><ins>+- "/Library/Frameworks", "/System/Library/Frameworks"
+- ]
</ins><span class="cx"> - for root in framework_roots:
</span><span class="cx"> - root_tcl = os.path.join(root, "Tcl.framework")
</span><span class="cx"> - root_tk = os.path.join(root, "Tk.framework")
</span><span class="lines">@@ -91,17 +90,17 @@
</span><span class="cx"> - _add_directory(self.compiler.include_dirs, dir, 1)
</span><span class="cx"> - break
</span><span class="cx"> - if frameworks:
</span><del>-- exts.append(Extension(
-- "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-- extra_compile_args=frameworks,
-- extra_link_args=frameworks))
</del><ins>+- exts.append(Extension("PIL._imagingtk",
+- ["_imagingtk.c", "Tk/tkImaging.c"],
+- extra_compile_args=frameworks,
+- extra_link_args=frameworks))
</ins><span class="cx"> - else:
</span><del>-- exts.append(Extension(
-- "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-- libraries=[feature.tcl, feature.tk]))
-+ exts.append(Extension(
-+ "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-+ libraries=[feature.tcl, feature.tk]))
</del><ins>+- exts.append(Extension("PIL._imagingtk",
+- ["_imagingtk.c", "Tk/tkImaging.c"],
+- libraries=[feature.tcl, feature.tk]))
++ exts.append(Extension("PIL._imagingtk",
++ ["_imagingtk.c", "Tk/tkImaging.c"],
++ libraries=[feature.tcl, feature.tk]))
</ins><span class="cx">
</span><span class="cx"> if os.path.isfile("_imagingmath.c"):
</span><span class="cx"> exts.append(Extension("PIL._imagingmath", ["_imagingmath.c"]))
</span></span></pre>
</div>
</div>
</body>
</html>