From 8bb74e0c25c6ac0248f6d507db09b67a953bbc1f Mon Sep 17 00:00:00 2001
From: Antony Lee <anntzer.lee@gmail.com>
Date: Tue, 2 Dec 2025 10:49:50 +0100
Subject: [PATCH 1/2] Compat in extension module for pre&post-mpl3.11 mathtext
 parses.

---
 ext/_mplcairo.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/_mplcairo.cpp b/ext/_mplcairo.cpp
index 4ed612f..73c7a2e 100644
--- a/ext/_mplcairo.cpp
+++ b/ext/_mplcairo.cpp
@@ -1477,9 +1477,13 @@ void GraphicsContextRenderer::draw_text(
       // because the symbol may have been synthesized by
       // FT2Font::get_glyph_name for a font without FT_FACE_FLAG_GLYPH_NAMES
       // (e.g. arial.ttf), which FT_Get_Name_Index can't know about.
-      auto const& [font, size, codepoint, ox, oy] =
-        spec.cast<
-          std::tuple<py::object, double, unsigned long, double, double>>();
+      // Support both pre and post Matplotlib 3.11 formats.
+      auto const& glyph = spec.cast<py::tuple>();
+      auto const& font = glyph[0].cast<py::object>();
+      auto const& size = glyph[1].cast<double>();
+      auto const& codepoint = glyph[2].cast<uint32_t>();
+      auto const& ox = glyph[glyph.size() - 2].cast<double>(),
+                & oy = glyph[glyph.size() - 1].cast<double>();
       mb.add_glyph(ox, -oy,
                    font.attr("fname").cast<std::string>(), size,
                    codepoint);

From e2a0ee9162e1e31d38353da072407835f6280311 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 21:43:39 +0000
Subject: [PATCH 2/2] Bump actions/upload-artifact from 4 to 7

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 7.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eb13997..a3f2282 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,12 +72,12 @@ jobs:
           fi
         ) &&
         PYTHONFAULTHANDLER=1 PYTHONIOENCODING=utf-8 ./run-examples.py
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: wheel-${{ matrix.os }}-${{ matrix.python-version }}
         path: dist/*.whl
       if: ${{ always() }}
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: result_images-${{ matrix.os }}-py${{ matrix.python-version }}
         path: result_images/
@@ -87,7 +87,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-    - uses: actions/upload-artifact/merge@v4
+    - uses: actions/upload-artifact/merge@v7
       with:
         name: wheels
         pattern: wheel-*