<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b2b01df1fc7a03e82dead0699f4bc03036517c3e">https://github.com/macports/macports-ports/commit/b2b01df1fc7a03e82dead0699f4bc03036517c3e</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 b2b01df1fc7 py-Pillow: move xcb to x11 variant
</span>b2b01df1fc7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b2b01df1fc7a03e82dead0699f4bc03036517c3e
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Fri Sep 25 13:09:09 2020 +0200

<span style='display:block; white-space:pre;color:#404040;'>    py-Pillow: move xcb to x11 variant
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Partial revertion of commit 28ee6c22297ac0a80d3a9147ea92e35eb79fa7fe
</span>---
 python/py-Pillow/Portfile | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 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 82941c72e8f..08737d7868b 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;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           active_variants 1.1
</span> PortGroup           python 1.0
 
 name                py-Pillow
 version             7.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> categories-append   devel
 platforms           darwin
 license             BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +35,8 @@ if {${name} ne ${subport}} {
</span>                             size    37673162
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.target        build_ext
</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,20 +55,13 @@ if {${name} ne ${subport}} {
</span>         reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # When built against a Tk using X11, Pillow will pick up some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # extra libraries, such libxcb. Tk's quartz variant doesn't depend
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # on these libraries, so we add matching variants here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant x11 conflicts quartz {
</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;'>-    variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        require_active_variants tk quartz x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.args-append   --disable-xcb
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![catch {set result [active_variants tk quartz x11]}] && $result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants +quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.args-delete      --disable-xcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-append     port:xorg-libxcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     livecheck.type      none
</pre><pre style='margin:0'>

</pre>