<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4ebfb76377e646f5e149a5816defdefd34979957">https://github.com/macports/macports-ports/commit/4ebfb76377e646f5e149a5816defdefd34979957</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4ebfb76 py-Pillow: update to 5.2.0
</span>4ebfb76 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4ebfb76377e646f5e149a5816defdefd34979957
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Sat Jul 21 10:17:04 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-Pillow: update to 5.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add size to checksums
</span><span style='display:block; white-space:pre;color:#404040;'> - similar patch is needed for py26/py33 subports, but need to use a
</span><span style='display:block; white-space:pre;color:#404040;'> different patch file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56833
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56823
</span>---
python/py-Pillow/Portfile | 17 ++++++---
python/py-Pillow/files/patch-setup-3.4.2.py.diff | 47 ++++++++++++++++++++++++
2 files changed, 58 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/Portfile b/python/py-Pillow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 753208c..3a5ff48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-Pillow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-Pillow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-Pillow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.2.0
</span> categories-append devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +23,9 @@ master_sites pypi:0f/57/25be1a4c2d487942c3ed360f6eee7f41c5b9196a09ca71c54
</span>
distname Pillow-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 300e2626b33b803b7bb6a553a15c5beab82922ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e2cfed9c172ea3e345d369b1f4357920cd5c7cb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14499068
</span>
if {${name} ne ${subport}} {
conflicts py${python.version}-pil
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,8 @@ if {${name} ne ${subport}} {
</span> pypi:[string index ${python.rootname} 0]/${python.rootname}
distname Pillow-${version}
checksums rmd160 40f983f9a57844c8338c1649b3473a8339dd85cf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10814666
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +53,11 @@ if {${name} ne ${subport}} {
</span> port:openjpeg \
port:freetype
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch {26 33} ${python.version}] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-setup-3.4.2.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/files/patch-setup-3.4.2.py.diff b/python/py-Pillow/files/patch-setup-3.4.2.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ba115b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-Pillow/files/patch-setup-3.4.2.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2016-10-18 15:12:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2018-07-21 12:04:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -233,42 +233,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.version[:3], "config"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # attempt to make sure we pick freetype2 over other versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs, "/sw/include/freetype2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs, "/sw/lib/freetype2/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # fink installation directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(library_dirs, "/sw/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs, "/sw/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # darwin ports installation directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(library_dirs, "/opt/local/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs, "/opt/local/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if Homebrew is installed, use its lib and include directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prefix = subprocess.check_output(['brew', '--prefix']).strip(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ).decode('latin1')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Homebrew not installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prefix = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ft_prefix = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if prefix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # add Homebrew's include and lib directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs, os.path.join(prefix, 'include'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ft_prefix = os.path.join(prefix, 'opt', 'freetype')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ft_prefix and os.path.isdir(ft_prefix):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # freetype might not be linked into Homebrew's prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.path.join(ft_prefix, 'include'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # fall back to freetype from XQuartz if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Homebrew's freetype is missing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(library_dirs, "/usr/X11/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs, "/usr/X11/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _add_directory(library_dirs, "@prefix@/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _add_directory(include_dirs, "@prefix@/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif sys.platform.startswith("linux"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch_tp = (plat.processor(), plat.architecture()[0])
</span></pre><pre style='margin:0'>
</pre>