<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/c58f6df98de0f7938ea0cbae184039f55ad5353c">https://github.com/macports/macports-ports/commit/c58f6df98de0f7938ea0cbae184039f55ad5353c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c58f6df98de0f7938ea0cbae184039f55ad5353c
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Thu Oct 15 21:12:39 2020 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-Pillow: update to 8.0.0
</span>---
python/py-Pillow/Portfile | 18 +++++++-------
python/py-Pillow/files/patch-setup.py.diff | 28 +++++++++++++++++-----
...ch-setup.py.diff => patch-setup.py_v6.2.1.diff} | 0
3 files changed, 32 insertions(+), 14 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 08737d7868b..efc7c3a0ba6 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,13 +4,13 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-Pillow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37 38 39
</span>
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ long_description ${description}
</span>
homepage https://github.com/python-imaging/Pillow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22e3635abca20eec5eefb93c9c7a4ed12f658aff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 39081948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fd0cd2f0dd7066773d6f5d9a7309e5775d353f9e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59304c67d12394815331eda95ec892bf54ad95e0aa7bc1ccd8e0a4a5a25d4bf3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44619742
</span>
if {${name} ne ${subport}} {
conflicts py${python.version}-pil
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,10 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 b6a0743f45072e5000f4d985dc1274d32bb7a40b \
sha256 bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1 \
size 37673162
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-setup.py_v6.2.1.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-setup.py.diff
</span> }
build.target build_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +53,6 @@ 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:#ffe0e0;'>-
</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.py.diff b/python/py-Pillow/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bb7d6cbe1ad..00d113f4caa 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-07-08 16:10:56.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-07-08 16:13:09.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -425,44 +425,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2020-10-14 19:02:31.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2020-10-15 21:00:31.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -433,60 +433,10 @@
</span> )
elif sys.platform == "darwin":
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> - # fink installation directories
- _add_directory(library_dirs, "/sw/lib")
- _add_directory(include_dirs, "/sw/include")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # darwin ports installation directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # darwin ports installation directories
</span> - _add_directory(library_dirs, "/opt/local/lib")
- _add_directory(include_dirs, "/opt/local/include")
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,9 @@
</span> - # 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"))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_dirs, os.path.join(prefix, "opt", "zlib", "include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span> - ft_prefix = os.path.join(prefix, "opt", "freetype")
-
- if ft_prefix and os.path.isdir(ft_prefix):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +45,21 @@
</span> - # 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:#e0ffe0;'>+- # SDK install path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sdk_path = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- subprocess.check_output(["xcrun", "--show-sdk-path"])
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except Exception:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sdk_path = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if sdk_path:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(library_dirs, os.path.join(sdk_path, "usr", "lib"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _add_directory(include_dirs, os.path.join(sdk_path, "usr", "include"))
</span> elif (
sys.platform.startswith("linux")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ or sys.platform.startswith("gnu")
</span><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_v6.2.1.diff
</span>similarity index 100%
copy from python/py-Pillow/files/patch-setup.py.diff
copy to python/py-Pillow/files/patch-setup.py_v6.2.1.diff
</pre><pre style='margin:0'>
</pre>