[Debian-on-mobile-maintainers] Bug#1112099: trixie-pu: package modemmanager/1.24.0-1+deb13u1

[Arnaud Ferraris]

Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: modemmanager at packages.debian.org, aferraris at debian.org
Control: affects -1 + src:modemmanager
User: release.debian.org at packages.debian.org
Usertags: pu

[ Reason ]
Fixes bug #1110197

[ Impact ]
Owners of the Fibocom FM350-GL modem (found in e.g. HP Elitebooks and Lenovo
Thinkpads) will be able to use it on Trixie; other users will be unaffected.

[ Tests ]
I manually checked no regression would occur with the hardware I have
available.
The bug reporter confirmed this update fixed their problem.

[ Risks ]
None, as the code change is trivial and has been released/tested upstream for
some time.

[ 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 (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
* Backport a 2-lines patch from latest upstream release.
* Change debian/gbp.conf to target trixie.
-------------- next part --------------
diff -Nru modemmanager-1.24.0/debian/changelog modemmanager-1.24.0/debian/changelog
--- modemmanager-1.24.0/debian/changelog	2025-04-11 23:32:31.000000000 +0200
+++ modemmanager-1.24.0/debian/changelog	2025-08-11 10:51:27.000000000 +0200
@@ -1,3 +1,10 @@
+modemmanager (1.24.0-1+deb13u1) trixie; urgency=medium
+
+  * d/gbp.conf: target stable branch
+  * d/patches: backport upstream fix for Fibocom FM350-GL (Closes: #1110197)
+
+ -- Arnaud Ferraris <aferraris at debian.org>  Mon, 11 Aug 2025 10:51:27 +0200
+
 modemmanager (1.24.0-1) unstable; urgency=medium
 
   * New upstream release. Final release of RC already in Trixie.
diff -Nru modemmanager-1.24.0/debian/gbp.conf modemmanager-1.24.0/debian/gbp.conf
--- modemmanager-1.24.0/debian/gbp.conf	2025-04-11 23:32:31.000000000 +0200
+++ modemmanager-1.24.0/debian/gbp.conf	2025-08-11 10:51:27.000000000 +0200
@@ -1,6 +1,6 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/latest
+debian-branch = debian/trixie
 upstream-branch = upstream/latest
 upstream-vcs-tag=%(version)s
 
diff -Nru modemmanager-1.24.0/debian/patches/0001-shared-fibocom-don-t-assume-parent-implements-the-fi.patch modemmanager-1.24.0/debian/patches/0001-shared-fibocom-don-t-assume-parent-implements-the-fi.patch
--- modemmanager-1.24.0/debian/patches/0001-shared-fibocom-don-t-assume-parent-implements-the-fi.patch	1970-01-01 01:00:00.000000000 +0100
+++ modemmanager-1.24.0/debian/patches/0001-shared-fibocom-don-t-assume-parent-implements-the-fi.patch	2025-08-11 10:51:27.000000000 +0200
@@ -0,0 +1,30 @@
+From: Dan Williams <dan at ioncontrol.co>
+Date: Sat, 12 Apr 2025 23:56:13 -0500
+Subject: shared-fibocom: don't assume parent implements the firmware
+ interface
+
+MMBroadbandModemMbimMtkFibocom doesn't, so don't assert it.
+
+Fixes: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/975
+
+Signed-off-by: Dan Williams <dan at ioncontrol.co>
+(cherry picked from commit 046b79a6766b6384db9cd56a9af5d148787bafe4)
+---
+ src/plugins/fibocom/mm-shared-fibocom.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c
+index 89be09e..0fbc9b5 100644
+--- a/src/plugins/fibocom/mm-shared-fibocom.c
++++ b/src/plugins/fibocom/mm-shared-fibocom.c
+@@ -75,8 +75,8 @@ get_private (MMSharedFibocom *self)
+         priv->class_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_class (self);
+ 
+         /* Setup firmware interface of parent class */
+-        g_assert (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface);
+-        priv->iface_modem_firmware_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface (self);
++        if (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface)
++            priv->iface_modem_firmware_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface (self);
+ 
+         g_object_set_qdata_full (G_OBJECT (self), private_quark, priv, (GDestroyNotify)private_free);
+     }
diff -Nru modemmanager-1.24.0/debian/patches/series modemmanager-1.24.0/debian/patches/series
--- modemmanager-1.24.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ modemmanager-1.24.0/debian/patches/series	2025-08-11 10:51:27.000000000 +0200
@@ -0,0 +1 @@
+0001-shared-fibocom-don-t-assume-parent-implements-the-fi.patch