[bug#73981] [PATCH 0/4] gnu: update modem-manager and deps.

[bug#73981] [PATCH 0/4] gnu: update modem-manager and deps.

[Zheng Junjie]

Zheng Junjie (4):
  gnu: libmbim: Update to 1.30.0.
  gnu: Add libqrtr-glib.
  gnu: libqmi: Update to 1.34.0.
  gnu: modem-manager: Update to 1.22.0.

 gnu/packages/freedesktop.scm | 104 +++++++++++++++++++++++++----------
 1 file changed, 74 insertions(+), 30 deletions(-)


base-commit: 0b3f419022d40d29b2e17e3abdeb0e9718976680
-- 
2.46.0

[bug#73981] [PATCH 1/4] gnu: libmbim: Update to 1.30.0.

[Zheng Junjie]

* gnu/packages/freedesktop.scm (libmbim): Update to 1.30.0.
[source]: Switch to git-fetch.
[build-system]: Switch to meson-build-system.
[native-inputs]: Add gobject-introspection, bash-completion, help2man. Replace
python-wrapper with python-minimal.

Change-Id: I607bff667a057e58bebb2f706d7021a4d1c8d763
---
 gnu/packages/freedesktop.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 0ab0bb51044..a7c740f3d05 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1900,19 +1900,24 @@ (define-public accountsservice
 (define-public libmbim
   (package
     (name "libmbim")
-    (version "1.26.4")
+    (version "1.30.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.freedesktop.org/software/libmbim/"
-                    "libmbim-" version ".tar.xz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.freedesktop.org/mobile-broadband/libmbim")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ncaarl4lgc7i52rwz50yq701wk2rr478cjybxbifsjqqk2cx27n"))))
-    (build-system gnu-build-system)
+                "00kbjvpka51zrfjigzd3rk6r4x8hkg1xfj7d9zl9lccysnxyjx5h"))))
+    (build-system meson-build-system)
     (native-inputs
      (list `(,glib "bin") ; for glib-mkenums
-           pkg-config python-wrapper))
+           pkg-config
+           python-minimal
+           gobject-introspection
+           bash-completion
+           help2man))
     (propagated-inputs
      (list glib)) ; required by mbim-glib.pc
     (inputs
-- 
2.46.0

[bug#73981] [PATCH 2/4] gnu: Add libqrtr-glib.

[Zheng Junjie]

* gnu/packages/freedesktop.scm (libqrtr-glib): New variable.

Change-Id: I84e26d0e8f69c8e5bc1c65925792aea296f6a97d
---
 gnu/packages/freedesktop.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a7c740f3d05..321ab2a1d1e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1932,6 +1932,37 @@ (define-public libmbim
      ;; The mbimcli tool is released under the GPLv2+ license.
      (list license:lgpl2.0+ license:gpl2+))))
 
+(define-public libqrtr-glib
+  (package
+    (name "libqrtr-glib")
+    (version "1.2.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0bfn5kfscli0rrxvmzdl6ix5ikh0kxia7ad83rmh1hksfcwynwlh"))))
+    (build-system meson-build-system)
+    (inputs
+     (list libgudev libmbim))
+    (native-inputs
+     (list `(,glib "bin")
+           gtk-doc
+           pkg-config
+           gobject-introspection
+           bash-completion))
+    (propagated-inputs
+     (list glib))
+    (synopsis "Qualcomm IPC Router protocol helper library")
+    (description
+     "libqrtr-glib is a glib-based library to use and manage the QRTR (Qualcomm
+IPC Router) bus.")
+    (home-page "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib")
+    (license license:lgpl2.1+)))
+
 (define-public libqmi
   (package
     (name "libqmi")
-- 
2.46.0

[bug#73981] [PATCH 3/4] gnu: libqmi: Update to 1.34.0.

[Zheng Junjie]

* gnu/packages/freedesktop.scm (libqmi): Update to 1.34.0.
[inputs]: Add libmbim and libqrtr-glib.
[native-inputs]: Add gobject-introspection, bash-completion and
help2man. Replace python-wrapper with python-minimal.
[build-system]: Switch to meson-build-system.
[source]: Swich to git-fetch.

Change-Id: I8a023cc07e5484d8abd5df4615ad5f4115729c1a
---
 gnu/packages/freedesktop.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 321ab2a1d1e..ccba510303d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1966,21 +1966,25 @@ (define-public libqrtr-glib
 (define-public libqmi
   (package
     (name "libqmi")
-    (version "1.30.8")
+    (version "1.34.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.freedesktop.org/software/libqmi/"
-                    "libqmi-" version ".tar.xz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.freedesktop.org/mobile-broadband/libqmi")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "140rmjw436rh6rqmnfw6yaflpffd27ilwcv4s9jvvl1skv784946"))))
-    (build-system gnu-build-system)
+                "1m5y2sf14qd2i9mvbb68wxqlfwvpiprgz8zmcx6wb2cnjgsszmwp"))))
+    (build-system meson-build-system)
     (inputs
-     (list libgudev))
+     (list libgudev libmbim libqrtr-glib))
     (native-inputs
      (list `(,glib "bin") ; for glib-mkenums
-           pkg-config python-wrapper))
+           pkg-config python-minimal
+           gobject-introspection
+           bash-completion
+           help2man))
     (propagated-inputs
      (list glib)) ; required by qmi-glib.pc
     (synopsis "Library to communicate with QMI-powered modems")
-- 
2.46.0

[bug#73981] [PATCH 4/4] gnu: modem-manager: Update to 1.22.0.

[Zheng Junjie]

* 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.
[inputs]: Add libqrtr-glib and elogind.
[native-inputs]: Remove python; add python-minimal, libxslt, and
bash-completion.

Change-Id: Ife0560eb48f3cceaf22ccc6bb54010074028cddf
---
 gnu/packages/freedesktop.scm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index ccba510303d..6eec91a907f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2000,34 +2000,38 @@ (define-public libqmi
 (define-public modem-manager
   (package
     (name "modem-manager")
-    (version "1.18.12")
+    (version "1.22.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.freedesktop.org/software/ModemManager/"
-                    "ModemManager-" version ".tar.xz"))
+              (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
-                "0c74n5jl1qvq2qlbwzfkgxny8smjcgkid1nhdnl6qnlmbn9f8r5l"))))
-    (build-system gnu-build-system)
+                "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")))
     (native-inputs
-     (list dbus
+     (list bash-completion
+           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 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