<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/cb1cbfa41168f6aee2bb5bab6b26222a9c2e3300">https://github.com/macports/macports-ports/commit/cb1cbfa41168f6aee2bb5bab6b26222a9c2e3300</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cb1cbfa41168f6aee2bb5bab6b26222a9c2e3300
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Dec 14 21:44:23 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-matplotlib: update to 3.10.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - pin to 3.9.4 for PY39 subport
</span>---
 python/py-matplotlib/Portfile                      | 43 +++++++++++++---------
 .../files/patch-meson-version-pyproject.toml.diff  | 11 ++++++
 .../files/patch-numpy-version-pyproject.toml.diff  | 11 ------
 .../files/patch-v394-pyproject.toml.diff           | 29 +++++++++++++++
 4 files changed, 66 insertions(+), 28 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 1276e432724..85b602acec4 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;'>@@ -5,7 +5,7 @@ PortGroup           python 1.0
</span> PortGroup           compiler_wrapper 1.0
 
 name                py-matplotlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.9.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.10.0
</span> revision            0
 
 categories-append   graphics math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,14 +25,36 @@ 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  88b836f308d2919dae3f419ba88dbb2451b1be42 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  cd5dbbc8e25cad5f706845c4d100e2c8b34691b412b93717ce38d8ae803bcfa5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    36113438
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  7d1b963d602d35f6bcaf955b081f366f75a82090 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  b886d02a581b96704c9d1ffe55709e49b4d2d52709ccebc4be42db856e511278 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    36686418
</span> 
 python.versions     39 310 311 312 313
 python.pep517_backend meson
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      patch-python-binary-meson.build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-meson-version-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} == 39} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version     3.9.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision    0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums   rmd160  334b62ae740d2853fafa4095d5d3cce1156dd8f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  1e00e8be7393cbdc6fedfa8a6fba02cf3e83814b285db1c60b906a023ba41bc3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    36106529
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-importlib-resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles  patch-python-binary-meson.build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-v394-pyproject.toml.diff
</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;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PYTHONBIN@@|${python.bin}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     compiler.cxx_standard 2017
 
     depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,19 +77,6 @@ if {${name} ne ${subport}} {
</span>                     port:py${python.version}-packaging \
                     port:py${python.version}-Pillow
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} < 310} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-importlib-resources
</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;'>-    patchfiles      patch-numpy-version-pyproject.toml.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-python-binary-meson.build.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PYTHONBIN@@|${python.bin}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     build.args-append \
                     -Csetup-args=-Dsystem-freetype=True \
                     -Csetup-args=-Dsystem-qhull=True
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-meson-version-pyproject.toml.diff b/python/py-matplotlib/files/patch-meson-version-pyproject.toml.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5b4c77d215f
</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-meson-version-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml.orig    2024-12-14 21:58:36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml 2024-12-14 21:58:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-backend = "mesonpy"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also keep in sync with optional dependencies above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "meson-python>=0.13.1,<0.17.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "meson-python>=0.13.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "pybind11>=2.13.2,!=2.13.3",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "setuptools_scm>=7",
</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-numpy-version-pyproject.toml.diff b/python/py-matplotlib/files/patch-numpy-version-pyproject.toml.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8cc6c22126e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/files/patch-numpy-version-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproject.toml.orig    2024-10-14 10:42:49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproject.toml 2024-10-14 10:43:41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #      and disabling build isolation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #   3. The <2.3 upper bound is for matching the numpy deprecation policy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #      it should not be loosened.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    "numpy>=2.0.0rc1,<2.3",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    "numpy>=1.25",
</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;'>- [tool.meson-python.args]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v394-pyproject.toml.diff b/python/py-matplotlib/files/patch-v394-pyproject.toml.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b499cab64d5
</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-v394-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml.orig    2024-12-14 22:19:39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml 2024-12-14 22:20:03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [project.optional-dependencies]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Should be a copy of the build dependencies below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dev = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "meson-python>=0.13.1,<0.17.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "meson-python>=0.13.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "numpy>=1.25",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "pybind11>=2.6,!=2.13.3",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "setuptools_scm>=7",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-backend = "mesonpy"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also keep in sync with optional dependencies above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "meson-python>=0.13.1,<0.17.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "meson-python>=0.13.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "pybind11>=2.6,!=2.13.3",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "setuptools_scm>=7",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #      and disabling build isolation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #   3. The <2.3 upper bound is for matching the numpy deprecation policy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #      it should not be loosened.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "numpy>=2.0.0rc1,<2.3",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "numpy",
</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;'>+ [tool.meson-python.args]
</span></pre><pre style='margin:0'>

</pre>