<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ee0fd8d42665c3b65307f928be9aca73a61443a5">https://github.com/macports/macports-ports/commit/ee0fd8d42665c3b65307f928be9aca73a61443a5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ee0fd8d42665c3b65307f928be9aca73a61443a5
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Wed Mar 6 09:56:10 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: patch for jquery-ui
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - PyPI archive already contains jquery-ui so patch setup.py such that it
</span><span style='display:block; white-space:pre;color:#404040;'> will not look in the cache or download the file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - instead just copy the jquery-ui directory in the post-build, if the
</span><span style='display:block; white-space:pre;color:#404040;'> directory does not exist already (this seems to vary by
</span><span style='display:block; white-space:pre;color:#404040;'> matplotlib/Python version)
</span>---
python/py-matplotlib/Portfile | 13 +++++++++++++
python/py-matplotlib/files/patch-jquery-ui.diff | 15 +++++++++++++++
2 files changed, 28 insertions(+)
<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 83eaf2e..45048d1 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;'>@@ -53,6 +53,7 @@ if {${name} ne ${subport}} {
</span> patch-src-macosx.m.diff \
patch-v3-qhull.diff \
patch-v3-setupext.py.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-jquery-ui.diff
</span>
if {${python.version} in "27 34"} {
version 2.2.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +70,7 @@ if {${name} ne ${subport}} {
</span> patch-src-macosx.m.diff \
patch-v2-qhull.diff \
patch-v2-setupext.py.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-jquery-ui.diff
</span> }
if {${python.version} eq 27} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +87,17 @@ if {${name} ne ${subport}} {
</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:#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> post-destroot {
xinstall -m 0755 -d ${destroot}${prefix}/share/doc/${subport} \
${destroot}${prefix}/share/${subport}
<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-jquery-ui.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5105e84
</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-jquery-ui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2019-03-06 09:36:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2019-03-06 09:36:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,9 +191,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _download_jquery_to("lib/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;'>+-cmdclass['sdist'] = sdist_with_jquery
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cmdclass['install_lib'] = install_lib_with_jquery
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cmdclass['develop'] = develop_with_jquery
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##cmdclass['sdist'] = sdist_with_jquery
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##cmdclass['install_lib'] = install_lib_with_jquery
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##cmdclass['develop'] = develop_with_jquery
</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;'>+ # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
</span></pre><pre style='margin:0'>
</pre>