<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4c8514f07b90a15545a9a418c0ebcfb49e53b483">https://github.com/macports/macports-ports/commit/4c8514f07b90a15545a9a418c0ebcfb49e53b483</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 4c8514f  py-Pillow: roll back py34 subport to previous working version 5.4.1
</span>4c8514f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4c8514f07b90a15545a9a418c0ebcfb49e53b483
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Apr 10 23:14:24 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    py-Pillow: roll back py34 subport to previous working version 5.4.1
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes build failure caused by the removal of support for python 3.4 in version 6.0.0.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://github.com/python-pillow/Pillow/commit/6eab984b0f925794210f2bf4b350550e8dbdd7e2
</span>---
 python/py-Pillow/Portfile                        | 12 ++++++
 python/py-Pillow/files/patch-setup-5.4.1.py.diff | 47 ++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

<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 7caa83a..7b4eaf3 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;'>@@ -40,6 +40,16 @@ if {${name} ne ${subport}} {
</span>                             size    10814666
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[lsearch {34} ${python.version}] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version             5.4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        master_sites        pypi:[string index ${python.rootname} 0]/${python.rootname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distname            Pillow-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums           rmd160  457ab4a946c80d739faba6af822258f2fd962014 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    16016153
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_build-append \
                         port:py${python.version}-setuptools
     depends_lib-append  port:py${python.version}-tkinter \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +64,8 @@ if {${name} ne ${subport}} {
</span> 
     if {[lsearch {26 33} ${python.version}] != -1} {
         patchfiles          patch-setup-3.4.2.py.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[lsearch {34} ${python.version}] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles          patch-setup-5.4.1.py.diff
</span>     } else {
         patchfiles          patch-setup.py.diff
     }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/files/patch-setup-5.4.1.py.diff b/python/py-Pillow/files/patch-setup-5.4.1.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3061460
</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-5.4.1.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  2019-01-05 09:33:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2019-04-10 22:38:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,42 +373,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 Exception:
</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") or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 sys.platform.startswith("gnu") or \
</span></pre><pre style='margin:0'>

</pre>