<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/b00ef1ba2cceefb26b869d43a5755bb3deb75ce7">https://github.com/macports/macports-ports/commit/b00ef1ba2cceefb26b869d43a5755bb3deb75ce7</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 b00ef1ba2cc py-matplotlib: update to 3.4.1
</span>b00ef1ba2cc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b00ef1ba2cceefb26b869d43a5755bb3deb75ce7
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Apr 2 22:26:22 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: update to 3.4.1
</span>---
python/py-matplotlib/Portfile | 38 ++++++++++++++--------
.../py-matplotlib/files/patch-v34-setup.cfg.diff | 16 +++++++++
.../files/patch-v34-src-macosx.m.diff | 27 +++++++++++++++
3 files changed, 68 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/Portfile b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cdafecfc48e..3f2e740c60b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/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-matplotlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.1
</span> revision 0
categories-append graphics math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ long_description Matplotlib strives to produce publication quality 2D \
</span>
homepage https://matplotlib.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3d579c5c5f8734d7199be8880dfac4eec4248e89 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 37941665
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 494973d4d5fd80a40766b92ccdff78f3b851ec9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 84d4c4f650f356678a5d658a43ca21a41fca13f9b8b00169c0b76e6a6a948908 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 37253296
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,20 +36,21 @@ python.versions 27 35 36 37 38 39
</span> if {${name} ne ${subport}} {
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-certifi \
</span> port:py${python.version}-setuptools
depends_lib-append \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span> port:qhull \
port:py${python.version}-cycler \
port:py${python.version}-dateutil \
port:py${python.version}-kiwisolver \
port:py${python.version}-numpy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-parsing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-parsing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-Pillow
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-v33-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v33-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-v34-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v34-src-macosx.m.diff
</span>
if {${python.version} eq 27} {
version 2.2.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,13 +80,24 @@ if {${name} ne ${subport}} {
</span> patch-v30-qhull.diff \
patch-v30-setupext.py.diff \
patch-v30-jquery-ui.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for version => 3.3.0, py-Pillow is used for handling PNG and libpng is no longer needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${python.version} eq 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3d579c5c5f8734d7199be8880dfac4eec4248e89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 37941665
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-v33-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v33-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fixup dependencies for version <= 3.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} in "27 35"} {
</span> depends_lib-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-Pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete \
</span> port:py${python.version}-certifi
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v34-setup.cfg.diff b/python/py-matplotlib/files/patch-v34-setup.cfg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..63e91417b75
</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-matplotlib/files/patch-v34-setup.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.cfg 2018-10-03 11:50:33.000000000 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.cfg 2018-10-03 11:54:34.000000000 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[libs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++system_freetype = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++system_qhull = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[gui_support]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++macosx=True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[packages]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tests=False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sample_data=True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[rc_options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++backend=MacOSX
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v34-src-macosx.m.diff b/python/py-matplotlib/files/patch-v34-src-macosx.m.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..368a1c78e9a
</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-matplotlib/files/patch-v34-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In version 3.3.0 upstream started making use of features introduced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in macOS 10.11, which caused failures when building the MacOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+backend on earlier macOS versions..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see: https://github.com/matplotlib/matplotlib/pull/17956
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and the discussion about why upstream's solution does not work for us;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the current patch is as Ryan suggested here::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/macports/macports-ports/commit/b07e0eb6440b1499bfd2157e19db86fc79984471#comments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/_macosx.m.orig 2021-03-31 03:54:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/_macosx.m 2021-04-03 12:45:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1210,10 +1210,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rect.size.height = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rect.origin.x += height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSTextView* messagebox = [[NSTextView alloc] initWithFrame: rect];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (@available(macOS 10.11, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 && MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ messagebox.textContainer.maximumNumberOfLines = 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [messagebox setFont: font];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [messagebox setDrawsBackground: NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [messagebox setSelectable: NO];
</span></pre><pre style='margin:0'>
</pre>