diff mbox series

[meta-python,051/105] python3-matplotlib: upgrade 3.10.8 -> 3.11.2

Message ID 20261116175359.342679-51-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-python,001/105] python3-absl: upgrade 2.1.0 -> 2.5.1 | expand

Commit Message

Khem Raj Nov. 16, 2026, 5:53 p.m. UTC
Matplotlib now bundles libraqm via meson subprojects; build against the
libraqm recipe with -Dsystem-libraqm=true and drop the patch that
disabled the subproject downloads (system freetype/qhull/libraqm need no
wraps).

Changes:
- Text and font processing overhauled using libraqm/HarfBuzz (complex
  text layout). libraqm is bundled and fetched as a meson subproject
  unless -Dsystem-libraqm=true; offline builds need it supplied.
- BREAKING: Python >= 3.11 (was 3.10), NumPy >= 1.25 (was 1.23),
  Pillow >= 9 (was 8), fonttools >= 4.28.2; build requires
  meson-python >= 0.13.2 (!= 0.17.*) and setuptools_scm < 10.
- Improvements to 3D Axes, performance, new accessible color sequences
  and flexible figure management; see upstream API change notes.
- 3.11.1/3.11.2 fix tight layout, 3D axis, PDF/PS font embedding and
  hexbin clipping, GIF skew, Qt/WebAgg HiDPI and Cairo glyph bugs.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...external-dependency-tarballs-via-mes.patch | 47 -------------------
 ...3.10.8.bb => python3-matplotlib_3.11.2.bb} |  6 +--
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-matplotlib/0001-Do-not-download-external-dependency-tarballs-via-mes.patch
 rename meta-python/recipes-devtools/python/{python3-matplotlib_3.10.8.bb => python3-matplotlib_3.11.2.bb} (84%)
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-matplotlib/0001-Do-not-download-external-dependency-tarballs-via-mes.patch b/meta-python/recipes-devtools/python/python3-matplotlib/0001-Do-not-download-external-dependency-tarballs-via-mes.patch
deleted file mode 100644
index 144bfac185..0000000000
--- a/meta-python/recipes-devtools/python/python3-matplotlib/0001-Do-not-download-external-dependency-tarballs-via-mes.patch
+++ /dev/null
@@ -1,47 +0,0 @@ 
-From a6b0bc129de493f57bf79005c48a8d4ca0df68c2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 9 Apr 2025 17:34:55 -0700
-Subject: [PATCH] Do not download external dependency tarballs via meson
-
-They are fetched by bitbake fetcher already
-
-Upstream-Status: Inappropriate [ OE-Specific ]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- subprojects/freetype-2.6.1.wrap | 7 +------
- subprojects/qhull.wrap          | 9 ++-------
- 2 files changed, 3 insertions(+), 13 deletions(-)
-
-diff --git a/subprojects/freetype-2.6.1.wrap b/subprojects/freetype-2.6.1.wrap
-index 763362b..74ecb13 100644
---- a/subprojects/freetype-2.6.1.wrap
-+++ b/subprojects/freetype-2.6.1.wrap
-@@ -1,10 +1,5 @@
- [wrap-file]
--source_url = https://download.savannah.gnu.org/releases/freetype/freetype-old/freetype-2.6.1.tar.gz
--source_fallback_url = https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz
--source_filename = freetype-2.6.1.tar.gz
--source_hash = 0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
--
--patch_directory = freetype-2.6.1-meson
-+directory = freetype-2.6.1
- 
- [provide]
- freetype-2.6.1 = freetype_dep
-diff --git a/subprojects/qhull.wrap b/subprojects/qhull.wrap
-index c52b07d..30b6904 100644
---- a/subprojects/qhull.wrap
-+++ b/subprojects/qhull.wrap
-@@ -1,9 +1,4 @@
- [wrap-file]
--# Also bump the cache key in `.circleci/config.yml`.
--# Also update the docs in `docs/devel/dependencies.rst`.
--directory = qhull-8.0.2
--source_url = https://github.com/qhull/qhull/archive/v8.0.2/qhull-8.0.2.tar.gz
--source_filename = qhull-8.0.2.tgz
--source_hash = 8774e9a12c70b0180b95d6b0b563c5aa4bea8d5960c15e18ae3b6d2521d64f8b
-+directory = qhull-2020.2
- 
--patch_directory = qhull-8.0.2
-+patch_directory = qhull-2020.2
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.10.8.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.11.2.bb
similarity index 84%
rename from meta-python/recipes-devtools/python/python3-matplotlib_3.10.8.bb
rename to meta-python/recipes-devtools/python/python3-matplotlib_3.11.2.bb
index 8489b91402..80f2853fbd 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib_3.10.8.bb
+++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.11.2.bb
@@ -14,19 +14,19 @@  DEPENDS = "\
     python3-setuptools-scm-native \
     freetype \
     libpng \
+    libraqm \
     python3-pybind11 \
     qhull \
 "
 
 SRC_URI += "file://run-ptest \
-            file://0001-Do-not-download-external-dependency-tarballs-via-mes.patch \
             file://0001-Change-types-for-width-height-to-match-definitions-i.patch \
             "
-SRC_URI[sha256sum] = "2299372c19d56bcd35cf05a2738308758d32b9eaed2371898d8f5bd33f084aa3"
+SRC_URI[sha256sum] = "cec596316640f2b394b8f0daa0ea61a8eae82d017b620b9f202befb972a59ea4"
 
 inherit pypi pkgconfig python3targetconfig meson ptest-python-pytest
 
-EXTRA_OEMESON += "-Dsystem-freetype=true -Dsystem-qhull=true"
+EXTRA_OEMESON += "-Dsystem-freetype=true -Dsystem-libraqm=true -Dsystem-qhull=true"
 
 # LTO with clang needs lld
 LDFLAGS:append:toolchain-clang = " -fuse-ld=lld"