<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/b07e0eb6440b1499bfd2157e19db86fc79984471">https://github.com/macports/macports-ports/commit/b07e0eb6440b1499bfd2157e19db86fc79984471</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 b07e0eb6440 py-matplotlib: fix build failure in MacOSX backend
</span>b07e0eb6440 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b07e0eb6440b1499bfd2157e19db86fc79984471
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Jul 18 19:43:11 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: fix build failure in MacOSX backend
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The earlier patch for the backend is obsolete already
</span><span style='display:block; white-space:pre;color:#404040;'> since matplotlib version 2.0.0.
</span>---
python/py-matplotlib/Portfile | 8 ++---
.../py-matplotlib/files/patch-v2-src-macosx.m.diff | 11 -------
.../files/patch-v30-src-macosx.m.diff | 11 -------
.../files/patch-v33-src-macosx.m.diff | 35 ++++++++++++++--------
4 files changed, 26 insertions(+), 39 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 f643bff2209..84917079d68 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;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name py-matplotlib
version 3.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories-append graphics math
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ if {${name} ne ${subport}} {
</span>
if {${python.version} eq 27} {
version 2.2.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 4532a205e8f40d6f40346b2e461d3dca144b38b9 \
sha256 a3037a840cd9dfdc2df9fee8af8f76ca82bfab173c0f9468193ca7a89a2b60ea \
size 36678633
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,19 +65,17 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-tz
patchfiles patch-v2-setup.cfg.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v2-src-macosx.m.diff \
</span> patch-v2-qhull.diff \
patch-v2-setupext.py.diff \
patch-v2-jquery-ui.diff
} elseif {${python.version} eq 35} {
version 3.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> checksums rmd160 98ecd1ca25d555bde5d43fcaef800f7436d7d738 \
sha256 e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7 \
size 36640137
patchfiles patch-v30-setup.cfg.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v30-src-macosx.m.diff \
</span> patch-v30-qhull.diff \
patch-v30-setupext.py.diff \
patch-v30-jquery-ui.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v2-src-macosx.m.diff b/python/py-matplotlib/files/patch-v2-src-macosx.m.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7a83a57468..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v2-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/_macosx.m.orig 2018-08-09 23:01:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/_macosx.m 2018-10-04 10:20:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ApplicationServices/ApplicationServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef kCTForegroundColorFromContextAttributeName
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern const CFStringRef kCTForegroundColorFromContextAttributeName AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Python.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v30-src-macosx.m.diff b/python/py-matplotlib/files/patch-v30-src-macosx.m.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7a83a57468..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v30-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/_macosx.m.orig 2018-08-09 23:01:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/_macosx.m 2018-10-04 10:20:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ApplicationServices/ApplicationServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef kCTForegroundColorFromContextAttributeName
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern const CFStringRef kCTForegroundColorFromContextAttributeName AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Python.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v33-src-macosx.m.diff b/python/py-matplotlib/files/patch-v33-src-macosx.m.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 102a7ed69d4..bb00fb8ab0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v33-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v33-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/_macosx.m.orig 2019-05-18 14:01:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/_macosx.m 2019-05-21 09:49:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PY_SSIZE_T_CLEAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ApplicationServices/ApplicationServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef kCTForegroundColorFromContextAttributeName
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern const CFStringRef kCTForegroundColorFromContextAttributeName AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Python.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>+--- src/_macosx.m.orig 2020-07-18 17:50:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/_macosx.m 2020-07-18 19:44:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1207,8 +1207,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;'>+- 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;'>++ if (@available(macOS 10.11, *)) {
</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;'>++
</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>