| author | Jan Alexander Steffens (heftig)
<heftig@archlinux.org> 2025-06-29 23:43:17 UTC |
| committer | Jan Alexander Steffens (heftig)
<heftig@archlinux.org> 2025-06-29 23:43:17 UTC |
| parent | da2ef7fe51bf824374d768c18d2c410cb5a657fe |
| .SRCINFO | +2 | -4 |
| 0001-Fix-gtk-doc-build.patch | +0 | -148 |
| PKGBUILD | +9 | -5 |
diff --git a/.SRCINFO b/.SRCINFO index 38c9e4b..4a12279 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = modemmanager pkgdesc = Mobile broadband modem management service pkgver = 1.24.0 - pkgrel = 1 + pkgrel = 2 url = https://www.freedesktop.org/wiki/Software/ModemManager/ arch = x86_64 license = GPL-2.0-or-later @@ -30,11 +30,9 @@ pkgbase = modemmanager depends = ppp depends = systemd-libs source = git+https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git?signed#tag=1.24.0 - source = 0001-Fix-gtk-doc-build.patch validpgpkeys = A814D09B9C5BC01945A64308AECE0239C6606AD5 validpgpkeys = 3A948E16E8860C68CD68441D734614319E26A433 b2sums = 71728bbd6abda4b88c24b7ba727f809fbe84db556ceab914bd1e3982e009ea5992da4214a8efc6ac76b6ebd9f6727f3da287d4c8206e37d97b405ea74e970963 - b2sums = 71dbf56ddd8a7786514b082ff4f5a652e4b9bd8c45f63a2580f23f4d5acece22f406cf43892b82f62ca8d3916c435bec7c493a62fcaf40414971f090c3088d79 pkgname = modemmanager license = GPL-2.0-or-later @@ -51,7 +49,7 @@ pkgname = modemmanager depends = polkit depends = ppp depends = systemd-libs - depends = libmm-glib=1.24.0-1 + depends = libmm-glib=1.24.0-2 depends = libmm-glib.so depends = libgudev-1.0.so depends = libglib-2.0.so diff --git a/0001-Fix-gtk-doc-build.patch b/0001-Fix-gtk-doc-build.patch deleted file mode 100644 index 9ee6093..0000000 --- a/0001-Fix-gtk-doc-build.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Fri, 11 Apr 2025 03:20:09 +0200 -Subject: [PATCH] Fix gtk-doc build - -Fix a duplicate `id` and the inclusions of gdbus docs. ---- - .../api/ModemManager-dbus-reference.xml | 46 +++++++++---------- - docs/reference/api/meson.build | 5 ++ - 2 files changed, 28 insertions(+), 23 deletions(-) - -diff --git a/docs/reference/api/ModemManager-dbus-reference.xml b/docs/reference/api/ModemManager-dbus-reference.xml -index d6237242a814..815b0628310c 100644 ---- a/docs/reference/api/ModemManager-dbus-reference.xml -+++ b/docs/reference/api/ModemManager-dbus-reference.xml -@@ -92,7 +92,7 @@ - This object also controls any process-wide operation, such as the log - level being used by the daemon. - </para> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.xml"/> - </chapter> - - <chapter id="ref-dbus-object-modem"> -@@ -129,74 +129,74 @@ - or the - <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.ModemCdma">CDMA interface</link>. - </para> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Voice.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.CellBroadcast.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Sar.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml"/> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Oma.xml"/> -- <!--xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/--> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Voice.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.CellBroadcast.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Sar.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Oma.xml"/> -+ <!--xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/--> - </chapter> - - <chapter id="ref-dbus-object-bearer"> - <title>The <literal>/org/freedesktop/ModemManager/Bearers</literal> objects</title> - <para> - Bearer objects are owned and managed by specific - <link linkend="ref-dbus-object-modem">Modem</link> objects. A single Modem - may expose one or more Bearer objects, which can then be used to get the - modem into connected state. - </para> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml"/> - </chapter> - - <chapter id="ref-dbus-object-sim"> - <title>The <literal>/org/freedesktop/ModemManager/SIMs</literal> objects</title> - <para> - Broadband modems usually need a SIM card to operate. Each - <link linkend="ref-dbus-object-modem">Modem</link> object will therefore - expose up to one SIM object, which allows SIM-specific actions such as PIN - unlocking. - </para> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml"/> - </chapter> - - <chapter id="ref-dbus-object-sms"> - <title>The <literal>/org/freedesktop/ModemManager/SMSs</literal> objects</title> - <para> - Modems implementing the - <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.Messaging">Messaging interface</link> - will export one SMS object for each SMS stored in the device. - </para> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml"/> - </chapter> - - <chapter id="ref-dbus-object-call"> - <title>The <literal>/org/freedesktop/ModemManager/Calls</literal> objects</title> - <para> - Modems implementing the - <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.Voice">Voice interface</link> - will export one Call object for each Call managed in the device. - </para> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml"/> - </chapter> - -- <chapter id="ref-dbus-object-call"> -+ <chapter id="ref-dbus-object-cbm"> - <title>The <literal>/org/freedesktop/ModemManager/CBM</literal> objects</title> - <para> - Modems implementing the - <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.CellBroadcast">Cell Broadcast interface</link> - will export one CBM object for each Cell Broadcast message received by the device. - </para> -- <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml"/> -+ <xi:include href="mm-gdbus-doc-org.freedesktop.ModemManager1.Cbm.xml"/> - </chapter> - - </part> -diff --git a/docs/reference/api/meson.build b/docs/reference/api/meson.build -index d7c420c7cc1b..2c02648a7130 100644 ---- a/docs/reference/api/meson.build -+++ b/docs/reference/api/meson.build -@@ -22,17 +22,22 @@ expand_content_files = [ - 'ModemManager-overview.xml', - # FIXME: workaround because only strings can be included and not custom targets (gen_docs) - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml', -+ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Call.xml', -+ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Cbm.xml', -+ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.CellBroadcast.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Oma.xml', -+ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Sar.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml', -+ generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Voice.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml', - generated_build_dir / 'mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml', diff --git a/PKGBUILD b/PKGBUILD index bbe840f..c732196 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgname=( modemmanager-docs ) pkgver=1.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mobile broadband modem management service" url="https://www.freedesktop.org/wiki/Software/ModemManager/" arch=(x86_64) @@ -47,10 +47,8 @@ checkdepends=( ) source=( "git+https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git?signed#tag=${pkgver/[a-z]/-&}" - 0001-Fix-gtk-doc-build.patch ) -b2sums=('71728bbd6abda4b88c24b7ba727f809fbe84db556ceab914bd1e3982e009ea5992da4214a8efc6ac76b6ebd9f6727f3da287d4c8206e37d97b405ea74e970963' - '71dbf56ddd8a7786514b082ff4f5a652e4b9bd8c45f63a2580f23f4d5acece22f406cf43892b82f62ca8d3916c435bec7c493a62fcaf40414971f090c3088d79') +b2sums=('71728bbd6abda4b88c24b7ba727f809fbe84db556ceab914bd1e3982e009ea5992da4214a8efc6ac76b6ebd9f6727f3da287d4c8206e37d97b405ea74e970963') validpgpkeys=( A814D09B9C5BC01945A64308AECE0239C6606AD5 # Aleksander Morgado <aleksandermj@chromium.org> 3A948E16E8860C68CD68441D734614319E26A433 # Dan Williams <dan@ioncontrol.co> @@ -58,7 +56,13 @@ validpgpkeys=( prepare() { cd ModemManager - git apply -3 ../0001-Fix-gtk-doc-build.patch + + # Fix gtk-doc build + git cherry-pick -n 1ec2b86239c3686e22034baae0068bd5d52779ae + + # Fix for Fibocom modems + # https://gitlab.archlinux.org/archlinux/packaging/packages/modemmanager/-/issues/1 + git cherry-pick -n 018e44084825ab294ad2b5d5b301d2b9e2577eb1 } build() {