diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index c00fe2984b7b..7650478fbd76 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -1,57 +1,58 @@ PORTNAME= matplotlib -DISTVERSION= 3.10.8 -PORTREVISION= 2 +DISTVERSION= 3.11.1 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= mainland@apeiron.net COMMENT= Plotting library uses a syntax familiar to MATLAB users WWW= https://matplotlib.org/ LICENSE= PSFL BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>=2.13.2:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7:devel/py-setuptools-scm@${PY_FLAVOR} LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ - libqhull_r.so:math/qhull -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}contourpy>=1.0.1:math/py-contourpy@${PY_FLAVOR} \ + libqhull_r.so:math/qhull \ + libraqm.so:print/libraqm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contourpy>=1.0.1:math/py-contourpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fonttools>=4.22.0:print/py-fonttools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}kiwisolver>=1.3.1:math/py-kiwisolver@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.25:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=9:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=3:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.7:devel/py-python-dateutil@${PY_FLAVOR} -USES= compiler:c++17-lang gettext gnome localbase \ +USES= compiler:c++17-lang gettext gnome localbase \ pkgconfig python shebangfix uniquefiles:dirs USE_CXXSTD= c++17 USE_PYTHON= autoplist pep517 PEP517_BUILD_CONFIG_SETTING= -Csetup-args="-Dsystem-freetype=true" \ + -Csetup-args="-Dsystem-libraqm=true" \ -Csetup-args="-Dsystem-qhull=true" BINARY_ALIAS= pybind11-config=pybind11-config-${PYTHON_VER} PLIST_SUB= VER=${PORTVERSION} PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES post-extract: @${FIND} ${WRKSRC} -name '*.py' | \ ${XARGS} ${CHMOD} -x post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib -name '*.so' | \ ${XARGS} ${STRIP_CMD} post-install-EXAMPLES-on: #@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} #${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/math/py-matplotlib/distinfo b/math/py-matplotlib/distinfo index 8712db61f017..3e79eb7e41ef 100644 --- a/math/py-matplotlib/distinfo +++ b/math/py-matplotlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1772359259 -SHA256 (matplotlib-3.10.8.tar.gz) = 2299372c19d56bcd35cf05a2738308758d32b9eaed2371898d8f5bd33f084aa3 -SIZE (matplotlib-3.10.8.tar.gz) = 34806269 +TIMESTAMP = 1785188105 +SHA256 (matplotlib-3.11.1.tar.gz) = 69647db5746941c793d6e445a4cd349323ffb87d9cc958c2ad84a659b4832d30 +SIZE (matplotlib-3.11.1.tar.gz) = 32612045 diff --git a/math/py-matplotlib/files/patch-pyproject.toml b/math/py-matplotlib/files/patch-pyproject.toml deleted file mode 100644 index 37d20b446e5d..000000000000 --- a/math/py-matplotlib/files/patch-pyproject.toml +++ /dev/null @@ -1,23 +0,0 @@ - Can be removed when Upstream publishes a new release. - https://github.com/matplotlib/matplotlib/commit/03fa1ffb1b26733f109ae10ac67c8432f48ec320 - ---- pyproject.toml.orig 2026-03-01 09:44:50 UTC -+++ pyproject.toml -@@ -48,7 +48,7 @@ dev = [ - [project.optional-dependencies] - # Should be a copy of the build dependencies below. - dev = [ -- "meson-python>=0.13.1,<0.17.0", -+ "meson-python>=0.13.1,!=0.17.*", - "pybind11>=2.13.2,!=2.13.3", - "setuptools_scm>=7", - # Not required by us but setuptools_scm without a version, cso _if_ -@@ -72,7 +72,7 @@ requires = [ - build-backend = "mesonpy" - # Also keep in sync with optional dependencies above. - requires = [ -- "meson-python>=0.13.1,<0.17.0", -+ "meson-python>=0.13.1,!=0.17.*", - "pybind11>=2.13.2,!=2.13.3", - "setuptools_scm>=7", - ] diff --git a/math/py-matplotlib/files/patch-src___backend__agg__wrapper.cpp b/math/py-matplotlib/files/patch-src___backend__agg__wrapper.cpp deleted file mode 100644 index 97262c775702..000000000000 --- a/math/py-matplotlib/files/patch-src___backend__agg__wrapper.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- src/_backend_agg_wrapper.cpp.orig 2026-03-06 16:43:44 UTC -+++ src/_backend_agg_wrapper.cpp -@@ -250,12 +250,12 @@ PYBIND11_MODULE(_backend_agg, m, py::mod_gil_not_used( - - .def_buffer([](RendererAgg *renderer) -> py::buffer_info { - std::vector shape { -- renderer->get_height(), -- renderer->get_width(), -+ static_cast(renderer->get_height()), -+ static_cast(renderer->get_width()), - 4 - }; - std::vector strides { -- renderer->get_width() * 4, -+ static_cast(renderer->get_width() * 4), - 4, - 1 - }; -@@ -269,12 +269,12 @@ PYBIND11_MODULE(_backend_agg, m, py::mod_gil_not_used( - .def("get_extents", &PyBufferRegion_get_extents) - .def_buffer([](BufferRegion *buffer) -> py::buffer_info { - std::vector shape { -- buffer->get_height(), -- buffer->get_width(), -+ static_cast(buffer->get_height()), -+ static_cast(buffer->get_width()), - 4 - }; - std::vector strides { -- buffer->get_width() * 4, -+ static_cast(buffer->get_width() * 4), - 4, - 1 - };