<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/197fb482a06f9295741a16dbc099ba8ac0d32ad9">https://github.com/macports/macports-ports/commit/197fb482a06f9295741a16dbc099ba8ac0d32ad9</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 197fb482a06 py-matplotlib: update to 3.3.0
</span>197fb482a06 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 197fb482a06f9295741a16dbc099ba8ac0d32ad9
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Jul 16 21:50:16 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: update to 3.3.0
</span>---
python/py-matplotlib/Portfile | 50 +++++++++++-----------
.../py-matplotlib/files/patch-v32-jquery-ui.diff | 15 -------
python/py-matplotlib/files/patch-v32-qhull.diff | 18 --------
.../py-matplotlib/files/patch-v32-setupext.py.diff | 17 --------
...v32-setup.cfg.diff => patch-v33-setup.cfg.diff} | 15 +++----
...c-macosx.m.diff => patch-v33-src-macosx.m.diff} | 0
6 files changed, 32 insertions(+), 83 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 7bb1ef0afa7..f643bff2209 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.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.0
</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 e8bbf097da8ecabc57677781ce68b2399bfbdf78 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3d77a6630d093d74cbbfebaa0571d00790966be1ed204e4a8239f5cbd6835c5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 40295831
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a6b883a64588983ddecdfd7f4ef47077ef06121f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24e8db94948019d531ce0bcd637ac24b1c8f6744ac86d2aa0eb6dbaeb1386f82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38782487
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +48,8 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-numpy \
port:py${python.version}-parsing
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-v32-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v32-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v32-qhull.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v32-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v32-jquery-ui.diff
</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>
if {${python.version} eq 27} {
version 2.2.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +69,7 @@ if {${name} ne ${subport}} {
</span> patch-v2-qhull.diff \
patch-v2-setupext.py.diff \
patch-v2-jquery-ui.diff
<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;'>- if {${python.version} eq 35} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${python.version} eq 35} {
</span> version 3.0.3
revision 2
checksums rmd160 98ecd1ca25d555bde5d43fcaef800f7436d7d738 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,25 +81,32 @@ 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:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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;'>+ depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-Pillow
</span> }
build.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # build fails with gcc-4.0 on Leopard, use gcc-4.2 (#37069)
compiler.blacklist gcc-4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # jquery-ui is included in the PyPI files, patch added for setup.py that avoids trying
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to install if from the cache or download from URL. Just copy the directory in the post-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build phase.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libdir [glob -nocomplain ${worksrcpath}/build/lib*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${libdir}/matplotlib/backends/web_backend/jquery-ui-1.12.1]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/lib/matplotlib/backends/web_backend/jquery-ui-1.12.1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libdir}/matplotlib/backends/web_backend/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} in "27 35"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/setup.cfg
</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;'>+ # jquery-ui is included in the PyPI files, patch added for setup.py that avoids trying
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to install if from the cache or download from URL. Just copy the directory in the post-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build phase; only needed for versions < 3.3.0 !
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir [glob -nocomplain ${worksrcpath}/build/lib*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${libdir}/matplotlib/backends/web_backend/jquery-ui-1.12.1]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/lib/matplotlib/backends/web_backend/jquery-ui-1.12.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/matplotlib/backends/web_backend/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v32-jquery-ui.diff b/python/py-matplotlib/files/patch-v32-jquery-ui.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 82f914e8cbc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v32-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2020-03-03 08:42:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2020-03-06 11:44:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,9 +163,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _download_jquery_to(Path("lib/matplotlib/backends/web_backend/"))
</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;'>--cmdclass['sdist'] = sdist_with_jquery
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cmdclass['install_lib'] = install_lib_with_jquery
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cmdclass['develop'] = develop_with_jquery
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##cmdclass['sdist'] = sdist_with_jquery
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##cmdclass['install_lib'] = install_lib_with_jquery
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##cmdclass['develop'] = develop_with_jquery
</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;'>- # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v32-qhull.diff b/python/py-matplotlib/files/patch-v32-qhull.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 316af5892e8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v32-qhull.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setupext.py.orig 2020-03-03 08:42:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setupext.py 2020-03-06 11:43:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -681,10 +681,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qhull doesn't distribute pkg-config info, so we have no way of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # knowing whether a system install is recent enough. Thus, always use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the vendored version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ext.include_dirs.insert(0, 'extern')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if sysconfig.get_config_var('LIBM') == '-lm':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ext.libraries.extend('m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ##ext.include_dirs.insert(0, 'extern')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ##ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ##if sysconfig.get_config_var('LIBM') == '-lm':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ## ext.libraries.extend('m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ext.libraries.append('qhull')
</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 TTConv(SetupPackage):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v32-setupext.py.diff b/python/py-matplotlib/files/patch-v32-setupext.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dbe8e5ea9aa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v32-setupext.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,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setupext.py.orig 2020-03-06 11:43:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setupext.py 2020-03-06 11:44:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -796,10 +796,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class BackendTkAgg(OptionalBackendPackage):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name = "tkagg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- force = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- def check(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return "installing; run-time loading from Python Tcl/Tk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## force = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## def check(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## return "installing; run-time loading from Python Tcl/Tk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def get_extension(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources = [
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v32-setup.cfg.diff b/python/py-matplotlib/files/patch-v33-setup.cfg.diff
</span>similarity index 65%
rename from python/py-matplotlib/files/patch-v32-setup.cfg.diff
rename to python/py-matplotlib/files/patch-v33-setup.cfg.diff
<span style='display:block; white-space:pre;color:#808080;'>index e21f5b8ab03..63e91417b75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v32-setup.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v33-setup.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,16 @@
</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,16 @@
</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> +[gui_support]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+agg=True
</span> +macosx=True
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+tkagg=False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+windowing=False
</span> +
+[packages]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+sample_data=True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+toolkits=True
</span> +tests=False
<span style='display:block; white-space:pre;background:#e0ffe0;'>++sample_data=True
</span> +
+[rc_options]
+backend=MacOSX
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[directories]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+basedirlist=@@PREFIX@@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v32-src-macosx.m.diff b/python/py-matplotlib/files/patch-v33-src-macosx.m.diff
</span>similarity index 100%
rename from python/py-matplotlib/files/patch-v32-src-macosx.m.diff
rename to python/py-matplotlib/files/patch-v33-src-macosx.m.diff
</pre><pre style='margin:0'>
</pre>