Bug#1106901: unblock: matplotlib/3.10.1+dfsg1-4

[Nilesh Patra <nilesh@iki.fi>]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: matplotlib@packages.debian.org
Control: affects -1 + src:matplotlib
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package matplotlib

[ Reason ]
Fix for FTBFS bug #1106427

[ Impact ]
The package will fail build in trixie

[ Tests ]
This is a doc build which gets fixed with the patch

[ Risks ]
Trivial change, no risks

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock matplotlib/3.10.1+dfsg1-4

diff -Nru matplotlib-3.10.1+dfsg1/debian/changelog matplotlib-3.10.1+dfsg1/debian/changelog
--- matplotlib-3.10.1+dfsg1/debian/changelog	2025-04-19 20:58:04.000000000 +0530
+++ matplotlib-3.10.1+dfsg1/debian/changelog	2025-05-31 22:52:08.000000000 +0530
@@ -1,3 +1,14 @@
+matplotlib (3.10.1+dfsg1-4) unstable; urgency=medium
+
+  [ Dylan Aïssi ]
+  * Team upload.
+  * Add pkgconf in Build-Deps, meson requires it to detect freetype2.
+
+  [ Nilesh Patra ]
+  * Add patch to fix FTBFS (Closes: #1106427)
+
+ -- Nilesh Patra <nilesh@debian.org>  Sat, 31 May 2025 22:52:08 +0530
+
 matplotlib (3.10.1+dfsg1-3) unstable; urgency=medium
 
   [ James Addison ]
diff -Nru matplotlib-3.10.1+dfsg1/debian/control matplotlib-3.10.1+dfsg1/debian/control
--- matplotlib-3.10.1+dfsg1/debian/control	2025-04-19 20:58:04.000000000 +0530
+++ matplotlib-3.10.1+dfsg1/debian/control	2025-05-31 22:08:04.000000000 +0530
@@ -21,6 +21,7 @@
  libpng-dev,
  libqhull-dev,
  locales-all,
+ pkgconf,
  pybuild-plugin-pyproject,
  python3-all-dev,
  python3-cairo <!nocheck>,
diff -Nru matplotlib-3.10.1+dfsg1/debian/patches/fix-doc-build-basic-units.patch matplotlib-3.10.1+dfsg1/debian/patches/fix-doc-build-basic-units.patch
--- matplotlib-3.10.1+dfsg1/debian/patches/fix-doc-build-basic-units.patch	1970-01-01 05:30:00.000000000 +0530
+++ matplotlib-3.10.1+dfsg1/debian/patches/fix-doc-build-basic-units.patch	2025-05-31 22:51:16.000000000 +0530
@@ -0,0 +1,14 @@
+Description: Add check if self.value if iterable in basic_units example
+Author: Nilesh Patra <nilesh@debian.org>
+Last-Update: 2025-05-31
+--- a/galleries/examples/units/basic_units.py
++++ b/galleries/examples/units/basic_units.py
+@@ -170,6 +170,8 @@
+         # Return a generator expression rather than use `yield`, so that
+         # TypeError is raised by iter(self) if appropriate when checking for
+         # iterability.
++        if not hasattr(self.value, '__iter__'):
++            raise TypeError(f"Object of type {type(self.value).__name__} is not iterable")
+         return (TaggedValue(inner, self.unit) for inner in self.value)
+ 
+     def get_compressed_copy(self, mask):
diff -Nru matplotlib-3.10.1+dfsg1/debian/patches/series matplotlib-3.10.1+dfsg1/debian/patches/series
--- matplotlib-3.10.1+dfsg1/debian/patches/series	2025-04-19 20:58:04.000000000 +0530
+++ matplotlib-3.10.1+dfsg1/debian/patches/series	2025-05-31 22:47:46.000000000 +0530
@@ -12,3 +12,4 @@
 do-not-install-pfb.patch
 fix-auto-backend-case-sensitivity.patch
 fix-gi-import-empty-module.patch
+fix-doc-build-basic-units.patch