Subject: [PATCH v2 4/4] gnu: modem-manager: Update to 1.22.0.

From: Zheng Junjie <[email-masked]>
Date: Tue, 12 Nov 2024 11:46:32 +0800

* gnu/packages/freedesktop.scm (modem-manager): Update to 1.22.0.
[source]: Switch to git-fetch.
[build-system]: Switch to meson-build-system.
[arguments]<#:configure-flags>: Adjust udevdir. Set -Dsystemdsystemunitdir=no,
Set -Dvapi=true.
[inputs]: Add bash-completion, libqrtr-glib and elogind.
[native-inputs]: Remove python; add python-minimal and libxslt.

Change-Id: Ife0560eb48f3cceaf22ccc6bb54010074028cddf
---
 gnu/packages/freedesktop.scm | 42 +++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a3dc92108ec..af35625c18f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2011,34 +2011,46 @@ (define-public libqmi
 (define-public modem-manager
   (package
     (name "modem-manager")
-    (version "1.18.12")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.freedesktop.org/software/ModemManager/"
-                    "ModemManager-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0c74n5jl1qvq2qlbwzfkgxny8smjcgkid1nhdnl6qnlmbn9f8r5l"))))
-    (build-system gnu-build-system)
+    (version "1.22.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://gitlab.freedesktop.org/mobile-broadband/ModemManager")
+         (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0fj4ibjfsxal3xfk3hrj4l9vg7zbj42k9lj7151illl2n3d5ngzw"))))
+    (build-system meson-build-system)
     (arguments
      (list
       #:configure-flags
-      #~(list (string-append "--with-udev-base-dir=" #$output "/lib/udev"))))
+      #~(list (string-append "-Dudevdir=" #$output "/lib/udev")
+              "-Dsystemdsystemunitdir=no"
+              "-Dvapi=true")))
     (native-inputs
      (list dbus
            gettext-minimal
            gobject-introspection
            `(,glib "bin")               ;for glib-mkenums
+           libxslt                      ;for xsltproc
            pkg-config
-           python
-           python-dbus
-           python-pygobject
+           python-minimal
+           python-dbus                  ;for test
+           python-pygobject             ;for test
            vala))
     (propagated-inputs
      (list glib))                       ;required by mm-glib.pc
     (inputs
-     (list libgudev libmbim libqmi polkit))
+     (list bash-completion
+           elogind
+           libgudev
+           libmbim
+           libqmi
+           libqrtr-glib
+           polkit))
     (synopsis "Mobile broadband modems manager")
     (home-page "https://www.freedesktop.org/wiki/Software/ModemManager/")
     (description
-- 
2.46.0