<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/f6aef2905aa386de2ae5bf08f303a6e092669d69">https://github.com/macports/macports-ports/commit/f6aef2905aa386de2ae5bf08f303a6e092669d69</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f6aef2905aa386de2ae5bf08f303a6e092669d69
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Mon Jul 8 16:16:59 2019 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-Pillow: update to 6.1.0
</span>---
python/py-Pillow/Portfile | 8 +++----
python/py-Pillow/files/patch-setup.py.diff | 34 ++++++++++++++++--------------
2 files changed, 22 insertions(+), 20 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 7b4eaf3..e424776 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,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-Pillow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.1.0
</span> categories-append devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span>
distname Pillow-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 83ef4476d9ba361f18c6fd6882895233afd8bfae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 29472229
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1bd0d7d23e018769c8e0e20cf3fa30d179d3e877 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0804f77cb1e9b6dbd37601cee11283bba39a8d44b9ddb053400c58e0c0d7d9de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33781060
</span>
if {${name} ne ${subport}} {
conflicts py${python.version}-pil
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/files/patch-setup.py.diff b/python/py-Pillow/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f0d981b..bb7d6cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-Pillow/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-Pillow/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2018-01-02 00:04:32.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2018-01-12 14:12:10.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,42 +296,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.version[:3], "config"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2019-07-08 16:10:56.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2019-07-08 16:13:09.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -425,44 +425,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span>
elif sys.platform == "darwin":
- # attempt to make sure we pick freetype2 over other versions
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +16,11 @@
</span> -
- # if Homebrew is installed, use its lib and include directories
- try:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- prefix = subprocess.check_output(['brew', '--prefix']).strip(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ).decode('latin1')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prefix = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- subprocess.check_output(["brew", "--prefix"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .decode("latin1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span> - except Exception:
- # Homebrew not installed
- prefix = None
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,22 +29,21 @@
</span> -
- if prefix:
- # add Homebrew's include and lib directories
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, os.path.join(prefix, 'include'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ft_prefix = os.path.join(prefix, 'opt', 'freetype')
</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> -
- if ft_prefix and os.path.isdir(ft_prefix):
- # freetype might not be linked into Homebrew's prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.join(ft_prefix, 'include'))
</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, os.path.join(ft_prefix, "include"))
</span> - 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")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _add_directory(library_dirs, "@prefix@/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _add_directory(include_dirs, "@prefix@/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:#ffe0e0;'>- elif sys.platform.startswith("linux"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch_tp = (plat.processor(), plat.architecture()[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.platform.startswith("linux")
</span></pre><pre style='margin:0'>
</pre>