<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1e733f9ddafe346e508b51aa8be30065c365ab4f">https://github.com/macports/macports-ports/commit/1e733f9ddafe346e508b51aa8be30065c365ab4f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1e733f9ddafe346e508b51aa8be30065c365ab4f
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Thu Oct 4 12:23:07 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: update patches for version 3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - only a few backends left under [gui_support] in version 3 that require
</span><span style='display:block; white-space:pre;color:#404040;'> extension code to be compiled. All other backends can be selected at
</span><span style='display:block; white-space:pre;color:#404040;'> runtime, depending on which toolkits are installed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - leave all variants for the backends as is. For most of them the
</span><span style='display:block; white-space:pre;color:#404040;'> reinplace will not do anything; but the alternative is adding
</span><span style='display:block; white-space:pre;color:#404040;'> if-statements around all the reinplace blocks...
</span>---
python/py-matplotlib/Portfile | 16 ++++++++++------
.../files/{patch-qhull.diff => patch-v2-qhull.diff} | 0
.../{patch-setup.cfg.diff => patch-v2-setup.cfg.diff} | 0
...{patch-setupext.py.diff => patch-v2-setupext.py.diff} | 0
.../files/{patch-qhull.diff => patch-v3-qhull.diff} | 6 +++---
.../{patch-setup.cfg.diff => patch-v3-setup.cfg.diff} | 11 +----------
...{patch-setupext.py.diff => patch-v3-setupext.py.diff} | 10 +++++-----
7 files changed, 19 insertions(+), 24 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 28b0f34..c16ef08 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;'>@@ -48,6 +48,11 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-parsing \
port:py${python.version}-pyobjc-cocoa
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-v3-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v3-qhull.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v3-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${python.version} in "27 34"} {
github.setup matplotlib matplotlib 2.2.3 v
checksums rmd160 ef28a29f84a5f85c46d2bdad75e368bc9d1a6e9d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +61,11 @@ if {${name} ne ${subport}} {
</span>
depends_lib-append port:py${python.version}-six \
port:py${python.version}-tz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-v2-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v2-qhull.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v2-setupext.py.diff \
</span> }
if {${python.version} eq 27} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,12 +73,6 @@ if {${name} ne ${subport}} {
</span> port:py27-subprocess32
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qhull.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setupext-gtk3cairo.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig"
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-qhull.diff b/python/py-matplotlib/files/patch-v2-qhull.diff
</span>similarity index 100%
copy from python/py-matplotlib/files/patch-qhull.diff
copy to python/py-matplotlib/files/patch-v2-qhull.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-setup.cfg.diff b/python/py-matplotlib/files/patch-v2-setup.cfg.diff
</span>similarity index 100%
copy from python/py-matplotlib/files/patch-setup.cfg.diff
copy to python/py-matplotlib/files/patch-v2-setup.cfg.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-setupext.py.diff b/python/py-matplotlib/files/patch-v2-setupext.py.diff
</span>similarity index 100%
copy from python/py-matplotlib/files/patch-setupext.py.diff
copy to python/py-matplotlib/files/patch-v2-setupext.py.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-qhull.diff b/python/py-matplotlib/files/patch-v3-qhull.diff
</span>similarity index 87%
rename from python/py-matplotlib/files/patch-qhull.diff
rename to python/py-matplotlib/files/patch-v3-qhull.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5b6cbd75..07e125b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-qhull.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v3-qhull.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;'>---- setupext.py.orig 2018-10-03 09:21:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setupext.py 2018-10-03 09:23:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1318,23 +1318,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setupext.py.orig 2018-09-17 23:17:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setupext.py 2018-10-04 12:21:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1213,23 +1213,10 @@
</span>
def check(self):
self.__class__.found_external = True
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-setup.cfg.diff b/python/py-matplotlib/files/patch-v3-setup.cfg.diff
</span>similarity index 67%
rename from python/py-matplotlib/files/patch-setup.cfg.diff
rename to python/py-matplotlib/files/patch-v3-setup.cfg.diff
<span style='display:block; white-space:pre;color:#808080;'>index 9a677a0..e21f5b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-setup.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v3-setup.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,11 @@
</span> --- setup.cfg 2018-10-03 11:50:33.000000000 +0400
+++ setup.cfg 2018-10-03 11:54:34.000000000 +0400
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,16 @@
</span> +[gui_support]
+agg=True
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+cairo=False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gtk=False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gtk3agg=False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gtk3cairo=False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gtkagg=False
</span> +macosx=True
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+pyside=False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+qt4agg=False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+qt5agg=False
</span> +tkagg=False
+windowing=False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+wxagg=False
</span> +
+[packages]
+sample_data=True
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-setupext.py.diff b/python/py-matplotlib/files/patch-v3-setupext.py.diff
</span>similarity index 56%
rename from python/py-matplotlib/files/patch-setupext.py.diff
rename to python/py-matplotlib/files/patch-v3-setupext.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index b293f98..28446b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-setupext.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v3-setupext.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;'>---- setupext.py.orig 2018-10-04 10:20:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setupext.py 2018-10-04 10:20:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1453,10 +1453,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setupext.py.orig 2018-10-04 12:24:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setupext.py 2018-10-04 12:24:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1343,10 +1343,10 @@
</span>
class BackendTkAgg(OptionalBackendPackage):
name = "tkagg"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,5 +13,5 @@
</span> +## def check(self):
+## return "installing; run-time loading from Python Tcl / Tk"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- def runtime_check(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """ Checks whether TkAgg runtime dependencies are met
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_extension(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources = [
</span></pre><pre style='margin:0'>
</pre>