<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8cac23a3573e9a4f52033b601170d4da7bd2197a">https://github.com/macports/macports-ports/commit/8cac23a3573e9a4f52033b601170d4da7bd2197a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8cac23a3573e9a4f52033b601170d4da7bd2197a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Dec 24 14:19:58 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-Pillow: drop py36 subport
</span>---
python/py-Pillow/Portfile | 17 +-----
python/py-Pillow/files/patch-setup.py_v8.4.0.diff | 67 -----------------------
2 files changed, 1 insertion(+), 83 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 e3692ce469d..4b59f403ee2 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;'>@@ -9,7 +9,7 @@ revision 0
</span> categories-append devel
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 36 37 38 39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 37 38 39 310 311 312
</span> python.pep517 no
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,21 +34,6 @@ if {${name} ne ${subport}} {
</span> size 37811273
patchfiles-append patch-setup.py_v6.2.1.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${python.version} == 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c20a0bab9a469c3557044793174dd38905ce4be9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 49368411
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-setup.py_v8.4.0.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append --disable-xcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-delete --disable-xcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:xorg-libxcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
patchfiles-append patch-setup.py.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/files/patch-setup.py_v8.4.0.diff b/python/py-Pillow/files/patch-setup.py_v8.4.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3e2a80fd4a9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-Pillow/files/patch-setup.py_v8.4.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-10-15 09:26:23.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-10-16 16:06:42.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -490,62 +490,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # attempt to make sure we pick freetype2 over other versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/include/freetype2")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/lib/freetype2/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # fink installation directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/sw/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # darwin ports installation directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/opt/local/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/opt/local/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if Homebrew is installed, use its lib and include directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prefix = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- subprocess.check_output(["brew", "--prefix"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .decode("latin1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except Exception:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew not installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prefix = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ft_prefix = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if prefix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # add Homebrew's include and lib directories
</span><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;'>-- _add_directory(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs, os.path.join(prefix, "opt", "zlib", "include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</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:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ft_prefix and os.path.isdir(ft_prefix):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # freetype might not be linked into Homebrew's prefix
</span><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, os.path.join(ft_prefix, "include"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # fall back to freetype from XQuartz if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew's freetype is missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/usr/X11/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/usr/X11/include")
</span><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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # SDK install path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if not os.path.exists(sdk_path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sdk_path = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- subprocess.check_output(["xcrun", "--show-sdk-path"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .decode("latin1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except Exception:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sdk_path = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if sdk_path:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, os.path.join(sdk_path, "usr", "lib"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, os.path.join(sdk_path, "usr", "include"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.platform.startswith("linux")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or sys.platform.startswith("gnu")
</span></pre><pre style='margin:0'>
</pre>