diff --git a/build/pkgs/contourpy/checksums.ini b/build/pkgs/contourpy/checksums.ini index 2823ef85c08..78d5d4ec488 100644 --- a/build/pkgs/contourpy/checksums.ini +++ b/build/pkgs/contourpy/checksums.ini @@ -1,4 +1,4 @@ tarball=contourpy-VERSION.tar.gz -sha1=eb8520cb7172aa8b957d8ba2d09e8f6d9a068d2a -sha256=96ba37c2e24b7212a77da85004c38e7c4d155d3e72a45eeaf22c1f03f607e8ab +sha1=3166ff1ae1aa6565d4ccbdb2238a42e53bd3859a +sha256=4d8908b3bee1c889e547867ca4cdc54e5ab6be6d3e078556814a22457f49423c upstream_url=https://pypi.io/packages/source/c/contourpy/contourpy-VERSION.tar.gz diff --git a/build/pkgs/contourpy/package-version.txt b/build/pkgs/contourpy/package-version.txt index 524cb55242b..6085e946503 100644 --- a/build/pkgs/contourpy/package-version.txt +++ b/build/pkgs/contourpy/package-version.txt @@ -1 +1 @@ -1.1.1 +1.2.1 diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini index 317be590bcf..1a89d8b02b9 100644 --- a/build/pkgs/matplotlib/checksums.ini +++ b/build/pkgs/matplotlib/checksums.ini @@ -1,4 +1,4 @@ tarball=matplotlib-VERSION.tar.gz -sha1=b3391b48ab0bf91778064ce5b2226ff2a2658d7c -sha256=df8505e1c19d5c2c26aff3497a7cbd3ccfc2e97043d1e4db3e76afa399164b69 +sha1=6788a6d445c0fe34baf7022705e5e4e0035d90b0 +sha256=96ab43906269ca64a6366934106fa01534454a69e471b7bf3d79083981aaab92 upstream_url=https://pypi.io/packages/source/m/matplotlib/matplotlib-VERSION.tar.gz diff --git a/build/pkgs/matplotlib/dependencies b/build/pkgs/matplotlib/dependencies index 8abcba00ee8..214a1904da7 100644 --- a/build/pkgs/matplotlib/dependencies +++ b/build/pkgs/matplotlib/dependencies @@ -1,4 +1,4 @@ - numpy freetype pillow dateutil pyparsing tornado cycler qhull fonttools contourpy | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm $(PYTHON) + numpy packaging freetype pillow dateutil pyparsing cycler qhull fonttools contourpy kiwisolver importlib_resources | $(PYTHON_TOOLCHAIN) pybind11 meson_python setuptools_scm $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/matplotlib/package-version.txt b/build/pkgs/matplotlib/package-version.txt index 19811903a7f..2009c7dfad9 100644 --- a/build/pkgs/matplotlib/package-version.txt +++ b/build/pkgs/matplotlib/package-version.txt @@ -1 +1 @@ -3.8.0 +3.9.2 diff --git a/build/pkgs/matplotlib/spkg-install.in b/build/pkgs/matplotlib/spkg-install.in index e8cbd4e759d..f3c8d16e4af 100644 --- a/build/pkgs/matplotlib/spkg-install.in +++ b/build/pkgs/matplotlib/spkg-install.in @@ -1,7 +1,12 @@ -# Write a configuration file to src/setup.cfg +# Write a configuration file to src/mplsetup.cfg python3 make-setup-config.py +# https://github.com/scipy/scipy/issues/16536 - meson breaks when CXX="g++ -std=gnu++11" +export CXX=$(echo "$CXX" | sed 's/-std=[a-z0-9+]*//g') cd src # Finally install -sdh_pip_install . +# https://matplotlib.org/stable/install/dependencies.html#use-system-libraries +sdh_pip_install -C setup-args="-Dsystem-freetype=true" \ + -C setup-args="-Dsystem-qhull=true" \ + .