<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/02a34581b254ee74367ddaf42f9d6439f09e7e89">https://github.com/macports/macports-ports/commit/02a34581b254ee74367ddaf42f9d6439f09e7e89</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 02a3458 py-matplotlib: update to 3.1.0, pin to 3.0.3 for py35
</span>02a3458 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 02a34581b254ee74367ddaf42f9d6439f09e7e89
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue May 21 09:30:17 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: update to 3.1.0, pin to 3.0.3 for py35
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - separate/refresh patches for the three different versions
</span>---
python/py-matplotlib/Portfile | 37 ++++++++----
.../files/patch-setupext-gtk3cairo.py.diff | 68 ----------------------
...atch-jquery-ui.diff => patch-v2-jquery-ui.diff} | 14 ++---
...rc-macosx.m.diff => patch-v2-src-macosx.m.diff} | 0
...tch-jquery-ui.diff => patch-v30-jquery-ui.diff} | 14 ++---
.../{patch-v3-qhull.diff => patch-v30-qhull.diff} | 0
...-v3-setup.cfg.diff => patch-v30-setup.cfg.diff} | 0
...setupext.py.diff => patch-v30-setupext.py.diff} | 0
...c-macosx.m.diff => patch-v30-src-macosx.m.diff} | 0
...tch-jquery-ui.diff => patch-v31-jquery-ui.diff} | 14 ++---
python/py-matplotlib/files/patch-v31-qhull.diff | 18 ++++++
...-v3-setup.cfg.diff => patch-v31-setup.cfg.diff} | 0
.../py-matplotlib/files/patch-v31-setupext.py.diff | 17 ++++++
...c-macosx.m.diff => patch-v31-src-macosx.m.diff} | 7 ++-
14 files changed, 86 insertions(+), 103 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 651eae8..9ea334a 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.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.0
</span> revision 0
categories-append graphics math
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ homepage https://matplotlib.org/
</span> master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
distname ${python.rootname}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 98ecd1ca25d555bde5d43fcaef800f7436d7d738 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 36640137
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5f3befcf719ef1577f55b9fa3e84208bf6fcba9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1e0213f87cc0076f7b0c4c251d7e23601e2419cd98691df79edb95517ba06f0c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 37204551
</span>
if {${name} ne ${subport}} {
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,11 +49,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:#ffe0e0;'>- patchfiles patch-v3-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-v3-qhull.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v3-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-v31-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v31-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v31-qhull.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v31-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v31-jquery-ui.diff
</span>
if {${python.version} in "27 34"} {
version 2.2.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,10 +67,10 @@ 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-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v2-src-macosx.m.diff \
</span> patch-v2-qhull.diff \
patch-v2-setupext.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v2-jquery-ui.diff
</span> }
if {${python.version} eq 27} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,6 +78,21 @@ if {${name} ne ${subport}} {
</span> port:py27-subprocess32
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} eq 35} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 98ecd1ca25d555bde5d43fcaef800f7436d7d738 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 36640137
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-v30-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v30-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v30-qhull.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v30-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v30-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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-setupext-gtk3cairo.py.diff b/python/py-matplotlib/files/patch-setupext-gtk3cairo.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fa1d689..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-setupext-gtk3cairo.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setupext.py.orig 2018-10-04 11:17:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setupext.py 2018-10-04 11:20:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1676,35 +1676,36 @@
</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;'>- def backend_gtk3cairo_internal_check(x):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- import cairocffi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- import cairo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (False, "Requires cairocffi or pycairo to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (False, "Requires pygobject to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gi.require_version("Gtk", "3.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except ValueError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (False, "Requires gtk3 development files to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except AttributeError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (False, "pygobject version too old.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from gi.repository import Gtk, Gdk, GObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except (RuntimeError, ImportError):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (False, "Requires pygobject to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (True, "version %s.%s.%s" % (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Gtk.get_major_version(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Gtk.get_micro_version(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Gtk.get_minor_version()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (True, "Gtk and cairo installed by MacPorts")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## import cairocffi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## import cairo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## return (False, "Requires cairocffi or pycairo to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## return (False, "Requires pygobject to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## gi.require_version("Gtk", "3.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## except ValueError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## return (False, "Requires gtk3 development files to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## except AttributeError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## return (False, "pygobject version too old.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## from gi.repository import Gtk, Gdk, GObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## except (RuntimeError, ImportError):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## return (False, "Requires pygobject to be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## return (True, "version %s.%s.%s" % (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Gtk.get_major_version(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Gtk.get_micro_version(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Gtk.get_minor_version()))
</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;'>- class BackendGtk3Cairo(OptionalBackendPackage):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-jquery-ui.diff b/python/py-matplotlib/files/patch-v2-jquery-ui.diff
</span>similarity index 76%
copy from python/py-matplotlib/files/patch-jquery-ui.diff
copy to python/py-matplotlib/files/patch-v2-jquery-ui.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5105e84..46b43fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v2-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-03-06 09:36:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-03-06 09:36:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,9 +191,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2019-02-25 19:18:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2019-05-21 10:36:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,9 +188,9 @@
</span> _download_jquery_to("lib/matplotlib/backends/web_backend/")
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -cmdclass['sdist'] = sdist_with_jquery
-cmdclass['install_lib'] = install_lib_with_jquery
-cmdclass['develop'] = develop_with_jquery
+##cmdclass['sdist'] = sdist_with_jquery
+##cmdclass['install_lib'] = install_lib_with_jquery
+##cmdclass['develop'] = develop_with_jquery
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-src-macosx.m.diff b/python/py-matplotlib/files/patch-v2-src-macosx.m.diff
</span>similarity index 100%
copy from python/py-matplotlib/files/patch-src-macosx.m.diff
copy to python/py-matplotlib/files/patch-v2-src-macosx.m.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-jquery-ui.diff b/python/py-matplotlib/files/patch-v30-jquery-ui.diff
</span>similarity index 76%
copy from python/py-matplotlib/files/patch-jquery-ui.diff
copy to python/py-matplotlib/files/patch-v30-jquery-ui.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5105e84..e977101 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v30-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-03-06 09:36:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-03-06 09:36:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,9 +191,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2019-02-28 22:33:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2019-05-21 10:41:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,9 +160,9 @@
</span> _download_jquery_to("lib/matplotlib/backends/web_backend/")
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -cmdclass['sdist'] = sdist_with_jquery
-cmdclass['install_lib'] = install_lib_with_jquery
-cmdclass['develop'] = develop_with_jquery
+##cmdclass['sdist'] = sdist_with_jquery
+##cmdclass['install_lib'] = install_lib_with_jquery
+##cmdclass['develop'] = develop_with_jquery
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v3-qhull.diff b/python/py-matplotlib/files/patch-v30-qhull.diff
</span>similarity index 100%
rename from python/py-matplotlib/files/patch-v3-qhull.diff
rename to python/py-matplotlib/files/patch-v30-qhull.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v3-setup.cfg.diff b/python/py-matplotlib/files/patch-v30-setup.cfg.diff
</span>similarity index 100%
copy from python/py-matplotlib/files/patch-v3-setup.cfg.diff
copy to python/py-matplotlib/files/patch-v30-setup.cfg.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v3-setupext.py.diff b/python/py-matplotlib/files/patch-v30-setupext.py.diff
</span>similarity index 100%
rename from python/py-matplotlib/files/patch-v3-setupext.py.diff
rename to python/py-matplotlib/files/patch-v30-setupext.py.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-src-macosx.m.diff b/python/py-matplotlib/files/patch-v30-src-macosx.m.diff
</span>similarity index 100%
copy from python/py-matplotlib/files/patch-src-macosx.m.diff
copy to python/py-matplotlib/files/patch-v30-src-macosx.m.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-jquery-ui.diff b/python/py-matplotlib/files/patch-v31-jquery-ui.diff
</span>similarity index 76%
rename from python/py-matplotlib/files/patch-jquery-ui.diff
rename to python/py-matplotlib/files/patch-v31-jquery-ui.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5105e84..6af87d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v31-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-03-06 09:36:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-03-06 09:36:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,9 +191,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2019-05-18 14:01:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2019-05-21 09:49:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,9 +162,9 @@
</span> _download_jquery_to("lib/matplotlib/backends/web_backend/")
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -cmdclass['sdist'] = sdist_with_jquery
-cmdclass['install_lib'] = install_lib_with_jquery
-cmdclass['develop'] = develop_with_jquery
+##cmdclass['sdist'] = sdist_with_jquery
+##cmdclass['install_lib'] = install_lib_with_jquery
+##cmdclass['develop'] = develop_with_jquery
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v31-qhull.diff b/python/py-matplotlib/files/patch-v31-qhull.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..11a48e8
</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-v31-qhull.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setupext.py.orig 2019-05-21 09:40:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setupext.py 2019-05-21 09:42:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -842,10 +842,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qhull doesn't distribute pkg-config info, so we have no way of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # knowing whether a system install is recent enough. Thus, always use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the vendored version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ext.include_dirs.insert(0, 'extern')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if sysconfig.get_config_var('LIBM') == '-lm':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ext.libraries.extend('m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ##ext.include_dirs.insert(0, 'extern')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ##ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ##if sysconfig.get_config_var('LIBM') == '-lm':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ## ext.libraries.extend('m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext.libraries.append('qhull')
</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;'>+ class TTConv(SetupPackage):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v3-setup.cfg.diff b/python/py-matplotlib/files/patch-v31-setup.cfg.diff
</span>similarity index 100%
rename from python/py-matplotlib/files/patch-v3-setup.cfg.diff
rename to python/py-matplotlib/files/patch-v31-setup.cfg.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v31-setupext.py.diff b/python/py-matplotlib/files/patch-v31-setupext.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2aa632f
</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-v31-setupext.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setupext.py.orig 2019-05-21 09:49:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setupext.py 2019-05-21 09:54:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -958,10 +958,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class BackendTkAgg(OptionalBackendPackage):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = "tkagg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- force = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def check(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return "installing; run-time loading from Python Tcl/Tk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## force = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## def check(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## return "installing; run-time loading from Python Tcl/Tk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-src-macosx.m.diff b/python/py-matplotlib/files/patch-v31-src-macosx.m.diff
</span>similarity index 65%
rename from python/py-matplotlib/files/patch-src-macosx.m.diff
rename to python/py-matplotlib/files/patch-v31-src-macosx.m.diff
<span style='display:block; white-space:pre;color:#808080;'>index b7a83a5..102a7ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v31-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</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:#e0ffe0;'>+--- src/_macosx.m.orig 2019-05-18 14:01:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/_macosx.m 2019-05-21 09:49:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PY_SSIZE_T_CLEAN
</span> #include <Cocoa/Cocoa.h>
#include <ApplicationServices/ApplicationServices.h>
+#ifndef kCTForegroundColorFromContextAttributeName
</pre><pre style='margin:0'>
</pre>