<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/4aa41630d667638c6799675f32285d3f20729c2d">https://github.com/macports/macports-ports/commit/4aa41630d667638c6799675f32285d3f20729c2d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4aa41630d667638c6799675f32285d3f20729c2d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Nov 20 22:22:12 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: update to 3.5.0
</span>---
python/py-matplotlib/Portfile | 128 ++++++++++++---------
...-setup.cfg.diff => patch-v35-mplsetup.cfg.diff} | 4 +-
python/py-matplotlib/files/patch-v35-setup.py.diff | 24 ++++
...-v34-setupext.py => patch-v35-setupext.py.diff} | 0
...c-macosx.m.diff => patch-v35-src-macosx.m.diff} | 0
5 files changed, 100 insertions(+), 56 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 b9b72e97249..07c7386ebbf 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.4.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.5.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 dc40d088590d5145923820d072218f0e21a6858f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 37850796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 10659b89bc347e5e05b854cb43d81086ece8f58e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 38892a254420d95594285077276162a5e9e9c30b6da08bdc2a4d53331ad9a6fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 34963685
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,9 @@ if {${name} ne ${subport}} {
</span> depends_build-append \
port:pkgconfig \
port:py${python.version}-certifi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools_scm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools_scm_git_archive
</span>
depends_lib-append \
port:freetype \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +51,10 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-parsing \
port:py${python.version}-Pillow
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-v34-setup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v34-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v34-setupext.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-v35-mplsetup.cfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v35-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v35-setupext.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v35-setup.py.diff
</span>
if {${python.version} eq 27} {
version 2.2.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +73,15 @@ 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant gtk2 description "Enable GTKAgg backend" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-pygtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^gtk=False|gtk=True|" ${worksrcpath}/${configfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^gtkagg=False|gtkagg=True|" ${worksrcpath}/${configfile}
</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;'>+
</span> } elseif {${python.version} eq 35} {
version 3.0.3
revision 4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +93,7 @@ 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;'>+
</span> } elseif {${python.version} eq 36} {
version 3.3.4
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,20 +105,52 @@ if {${name} ne ${subport}} {
</span> patch-v33-src-macosx.m.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fixup dependencies for version <= 3.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} in "27 35"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${version} 3.3.0] < 0} {
</span> depends_lib-replace \
port:py${python.version}-Pillow \
port:libpng
depends_build-delete \
port:py${python.version}-certifi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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}/${configfile}
</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.
</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;background:#e0ffe0;'>+ }
</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;'>+ set configfile mplsetup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${version} 3.5.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools_scm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools_scm_git_archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set configfile setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt4 description "Enable Qt4Agg backend" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^qt4agg=False|qt4agg=True|" ${worksrcpath}/${configfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
build.env-append \
PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
CFLAGS=${configure.cxxflags} \
CXXFLAGS=${configure.cxxflags} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.env-append \
PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
CFLAGS=${configure.cxxflags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,89 +163,64 @@ if {${name} ne ${subport}} {
</span> # https://trac.macports.org/ticket/61757
if {${os.platform} eq "darwin" && ${os.major} < 10} {
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^macosx=True|macosx=False|" ${worksrcpath}/setup.cfg
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} in "27 35"} {
</span><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><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; only needed for versions < 3.3.0 !
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^macosx=True|macosx=False|" ${worksrcpath}/${configfile}
</span> }
}
post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${subport} \
${destroot}${prefix}/share/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} README.rst matplotlibrc.template \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} README.rst \
</span> ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${version} 3.5.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} matplotlibrc.template \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file copy ${worksrcpath}/examples \
${destroot}${prefix}/share/${subport}
}
variant webagg description "Enable WebAgg backend" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-tornado
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${version} 3.5.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-tornado
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant tkinter description "Enable TkAgg backend" {
depends_lib-append port:py${python.version}-tkinter
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^tkagg=False|tkagg=True|" ${worksrcpath}/setup.cfg
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gtk2 description "Enable GTKAgg backend" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-pygtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^gtk=False|gtk=True|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^gtkagg=False|gtkagg=True|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^tkagg=False|tkagg=True|" ${worksrcpath}/${configfile}
</span> }
}
variant gtk3 description "Enable GTK3Agg backend" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-gobject3 path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^gtk3agg=False|gtk3agg=True|" ${worksrcpath}/setup.cfg
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt4 description "Enable Qt4Agg backend" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^qt4agg=False|qt4agg=True|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^gtk3agg=False|gtk3agg=True|" ${worksrcpath}/${configfile}
</span> }
}
variant qt5 description "Enable Qt5Agg backend" {
depends_lib-append port:py${python.version}-pyqt5
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^qt5agg=False|qt5agg=True|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^qt5agg=False|qt5agg=True|" ${worksrcpath}/${configfile}
</span> }
}
variant pyside description "Enable PySide backend" {
depends_lib-append port:py${python.version}-pyside
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^pyside=False|pyside=True|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^pyside=False|pyside=True|" ${worksrcpath}/${configfile}
</span> }
}
variant cairo description "Enable Cairo backends" {
depends_lib-append port:py${python.version}-cairo
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^cairo=False|cairo=True|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^cairo=False|cairo=True|" ${worksrcpath}/${configfile}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -229,7 +249,7 @@ if {${name} ne ${subport}} {
</span>
if {[variant_isset gtk3] && [variant_isset cairo]} {
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^gtk3cairo=False|gtk3cairo=True|" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^gtk3cairo=False|gtk3cairo=True|" ${worksrcpath}/${configfile}
</span> }
}
<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-v35-mplsetup.cfg.diff
</span>similarity index 62%
rename from python/py-matplotlib/files/patch-v34-setup.cfg.diff
rename to python/py-matplotlib/files/patch-v35-mplsetup.cfg.diff
<span style='display:block; white-space:pre;color:#808080;'>index 63e91417b75..3d9b0c1810b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-v34-setup.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-v35-mplsetup.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.cfg 2018-10-03 11:50:33.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.cfg 2018-10-03 11:54:34.000000000 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mplsetup.cfg 2018-10-03 11:50:33.000000000 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mplsetup.cfg 2018-10-03 11:54:34.000000000 +0400
</span> @@ -0,0 +1,13 @@
+[libs]
+system_freetype = true
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v35-setup.py.diff b/python/py-matplotlib/files/patch-v35-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eb30bf6ceef
</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-v35-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The released version throws the error below when importing matplotlib:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Traceback (most recent call last):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "<stdin>", line 1, in <module>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "/opt/local/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py", line 895, in <module>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaultParams = rcsetup.defaultParams = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "/opt/local/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py", line 898, in <dictcomp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rcParamsDefault[key]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ File "/opt/local/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py", line 674, in __getitem__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return dict.__getitem__(self, key)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+KeyError: 'webagg.port'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For upstream's merged fix see: https://github.com/matplotlib/matplotlib/pull/21662
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,7 +205,7 @@ def update_matplotlibrc(path):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idx for idx, line in enumerate(template_lines)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if "#backend:" in line]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template_lines[backend_line_idx] = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "#backend: {}".format(setupext.options["backend"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#backend: {}\n".format(setupext.options["backend"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if setupext.options["backend"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else "##backend: Agg")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path.write_text("".join(template_lines))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v34-setupext.py b/python/py-matplotlib/files/patch-v35-setupext.py.diff
</span>similarity index 100%
rename from python/py-matplotlib/files/patch-v34-setupext.py
rename to python/py-matplotlib/files/patch-v35-setupext.py.diff
<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-v35-src-macosx.m.diff
</span>similarity index 100%
rename from python/py-matplotlib/files/patch-v34-src-macosx.m.diff
rename to python/py-matplotlib/files/patch-v35-src-macosx.m.diff
</pre><pre style='margin:0'>
</pre>