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

  • Done
  • quality assurance status badge
Details
2 participants
  • Maxim Cournoyer
  • Zheng Junjie
Owner
unassigned
Submitted by
Zheng Junjie
Severity
normal
Z
Z
Zheng Junjie wrote on 24 Oct 09:36 +0200
(address . guix-patches@gnu.org)
cover.1729755152.git.zhengjunjie@iscas.ac.cn
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
Z
Z
Zheng Junjie wrote on 24 Oct 09:40 +0200
[PATCH 1/4] gnu: libmbim: Update to 1.30.0.
(address . 73981@debbugs.gnu.org)
d0915580877a8c1fb18160fca6515f63cbc8154a.1729755152.git.zhengjunjie@iscas.ac.cn
* 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(-)

Toggle diff (39 lines)
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
Z
Z
Zheng Junjie wrote on 24 Oct 09:40 +0200
[PATCH 2/4] gnu: Add libqrtr-glib.
(address . 73981@debbugs.gnu.org)
ea37322e566c9e7ac47067ce8e4e022b5ff3402e.1729755152.git.zhengjunjie@iscas.ac.cn
* gnu/packages/freedesktop.scm (libqrtr-glib): New variable.

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

Toggle diff (44 lines)
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
Z
Z
Zheng Junjie wrote on 24 Oct 09:40 +0200
[PATCH 3/4] gnu: libqmi: Update to 1.34.0.
(address . 73981@debbugs.gnu.org)
3c37c85b71df9170027684f8c3e7c227db236529.1729755152.git.zhengjunjie@iscas.ac.cn
* 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(-)

Toggle diff (41 lines)
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
Z
Z
Zheng Junjie wrote on 24 Oct 09:40 +0200
[PATCH 4/4] gnu: modem-manager: Update to 1.22.0.
(address . 73981@debbugs.gnu.org)
1d1285dedf55fa3a791245cf57a8bf2b8f7054d4.1729755152.git.zhengjunjie@iscas.ac.cn
* 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(-)

Toggle diff (58 lines)
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
M
M
Maxim Cournoyer wrote on 11 Nov 15:22 +0100
Re: [bug#73981] [PATCH 1/4] gnu: libmbim: Update to 1.30.0.
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)(address . 73981@debbugs.gnu.org)
87ttcd97fo.fsf@gmail.com
Hi Zheng,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Apologies, it seems I've duplicated your work in my just submitted
#74306! Some comments below.

Toggle quote (46 lines)
> * 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))

Here it would be nice to keep the inputs sorted alphabetically.
Shouldn't bash-completion be an 'input' instead of a 'native-input' ?

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 11 Nov 15:28 +0100
Re: [bug#73981] [PATCH 2/4] gnu: Add libqrtr-glib.
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)(address . 73981@debbugs.gnu.org)
87pln1974o.fsf@gmail.com
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (24 lines)
> * 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")

Too wide of a line; you should break (source (origin ... as
(source
(origin ...))

Note that 'guix style' has issues in this regard, which I've reported to
our tracker.

Toggle quote (15 lines)
> + (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))

My package only had (native-inputs (list gobject-introspection gtk-doc pkg-config))

Toggle quote (3 lines)
> + (propagated-inputs
> + (list glib))

When propagating inputs, we typically leave a comment as to why, as it
shouldn't be made without a good reason (it hurts composability in a
profile). Typically something like a

;required by some-package.pc

inline comment when pkg-config files list them in Requires or
Requires.private (the later is consulted when retrieving Cflags with
pkg-config... even when using dynamic linking).

In my package I had listed it as an 'input'; I hadn't checked for .pc
files, but didn't have problems building modem-manager with it.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 12 Nov 02:06 +0100
Re: [bug#73981] [PATCH 3/4] gnu: libqmi: Update to 1.34.0.
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)(address . 73981@debbugs.gnu.org)
87ldxp8dld.fsf@gmail.com
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (3 lines)
> * gnu/packages/freedesktop.scm (libqmi): Update to 1.34.0.
> [inputs]: Add libmbim and libqrtr-glib.

These should go to the propagated-inputs as they are required by
qmi-glib.pc, with an explanatory comment like

Toggle snippet (3 lines)
;; These are required by qmi-glib.pc.

Toggle quote (3 lines)
> [native-inputs]: Add gobject-introspection, bash-completion and
> help2man. Replace python-wrapper with python-minimal.

Not sure about bash-completion. I'll research if it should be a native
input or a regular one.

Otherwise LGTM.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 12 Nov 02:13 +0100
Re: [bug#73981] [PATCH 4/4] gnu: modem-manager: Update to 1.22.0.
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)(address . 73981@debbugs.gnu.org)
87h68d8d9u.fsf@gmail.com
Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (32 lines)
> * 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")

Long line; please indent origin under source to help cope with that.

Toggle quote (14 lines)
> + (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")

Is it /lib/udev or /lib/udev/rules.d ? I had used the later. It seems
you are correct, after checking the file hierarchy of my package:

Toggle snippet (5 lines)
gnu/store/s9jad478d7ks5cybygiibgyrgywi7dhn-modem-manager-1.22.0/lib/udev/rules.d
/gnu/store/s9jad478d7ks5cybygiibgyrgywi7dhn-modem-manager-1.22.0/lib/udev/rules.d/rules.d
/gnu/store/s9jad478d7ks5cybygiibgyrgywi7dhn-modem-manager-1.22.0/lib/udev/rules.d/rules.d/77-mm-broadmobi-port-types.rules

Toggle quote (10 lines)
> + "-Dsystemdsystemunitdir=no")))
> (native-inputs
> - (list dbus
> + (list bash-completion
> + dbus
> gettext-minimal
> gobject-introspection
> `(,glib "bin") ;for glib-mkenums
> + libxslt ; for xsltproc

nitpick: No space between ';' and the text for inline comments.

Toggle quote (8 lines)
> pkg-config
> - python
> - python-dbus
> - python-pygobject
> + python-minimal
> + python-dbus ; for test
> + python-pygobject ; for test

Please keep inputs sorted, and ditto about the space in inline comment.

Toggle quote (2 lines)
> vala))

vala bindingsn are no longer generated by default, so you'll want to add
-Dvapi=true to the configure flags.

Toggle quote (6 lines)
> (propagated-inputs
> (list glib)) ;required by mm-glib.pc
> (inputs
> - (list libgudev libmbim libqmi polkit))
> + (list elogind libgudev libmbim libqmi libqrtr-glib polkit))

I didn't list libqrtr-glib here since it should be propagated by libqmi.

Otherwise, LGTM. Feel free to update your series with my suggestions
and I'll rebase my branch after merging it. Sorry about the duplicated
work; at least it made reviewing it trivial :-).

--
Thanks,
Maxim
Z
Z
Zheng Junjie wrote on 12 Nov 04:46 +0100
[PATCH v2 0/4] update modem-manager and deps
(address . 73981@debbugs.gnu.org)
cover.1731382968.git.zhengjunjie@iscas.ac.cn
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 | 148 +++++++++++++++++++++++++----------
1 file changed, 105 insertions(+), 43 deletions(-)


base-commit: b790db7589858fc77989b4d1f369c52bca6d6e7c
prerequisite-patch-id: f66cd2a9b573a4b884f66abe5e92465d04e1ebd6
prerequisite-patch-id: 148cdb72f12b8fae6e0b3cc2f9f691186c959593
--
2.46.0
Z
Z
Zheng Junjie wrote on 12 Nov 04:46 +0100
[PATCH v2 1/4] gnu: libmbim: Update to 1.30.0.
(address . 73981@debbugs.gnu.org)
7923e61f295ab023a7dfb27298e688713e7ceee9.1731382968.git.zhengjunjie@iscas.ac.cn
* 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, help2man. Replace
python-wrapper with python-minimal.
[inputs]: Add bash-completion.

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

Toggle diff (51 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index bd34615e682..7441737a4bd 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1901,23 +1901,30 @@ (define-public accountsservice
(define-public libmbim
(package
(name "libmbim")
- (version "1.26.4")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://www.freedesktop.org/software/libmbim/"
- "libmbim-" version ".tar.xz"))
- (sha256
- (base32
- "1ncaarl4lgc7i52rwz50yq701wk2rr478cjybxbifsjqqk2cx27n"))))
- (build-system gnu-build-system)
+ (version "1.30.0")
+ (source
+ (origin
+ (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
+ "00kbjvpka51zrfjigzd3rk6r4x8hkg1xfj7d9zl9lccysnxyjx5h"))))
+ (build-system meson-build-system)
(native-inputs
- (list `(,glib "bin") ; for glib-mkenums
- pkg-config python-wrapper))
+ (list `(,glib "bin") ;for glib-mkenums
+ gobject-introspection
+ help2man
+ pkg-config
+ python-minimal))
(propagated-inputs
- (list glib)) ; required by mbim-glib.pc
+ (list glib)) ;required by mbim-glib.pc
(inputs
- (list libgudev))
+ (list
+ bash-completion
+ libgudev))
(synopsis "Library to communicate with MBIM-powered modems")
(home-page "https://www.freedesktop.org/wiki/Software/libmbim/")
(description
--
2.46.0
Z
Z
Zheng Junjie wrote on 12 Nov 04:46 +0100
[PATCH v2 2/4] gnu: Add libqrtr-glib.
(address . 73981@debbugs.gnu.org)
2d2cb5f5ceb3eaea29d8ae8d3e161dbec26464d1.1731382968.git.zhengjunjie@iscas.ac.cn
* gnu/packages/freedesktop.scm (libqrtr-glib): New variable.

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

Toggle diff (46 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7441737a4bd..1a192f0a806 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1935,6 +1935,39 @@ (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 bash-completion
+ `(,glib "bin")
+ gtk-doc
+ gobject-introspection
+ pkg-config))
+ (propagated-inputs
+ (list glib)) ;required by mm-glib.pc
+ (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
Z
Z
Zheng Junjie wrote on 12 Nov 04:46 +0100
[PATCH v2 3/4] gnu: libqmi: Update to 1.34.0.
(address . 73981@debbugs.gnu.org)
8db675763609f4eab9d31d246f070e86c3623a7c.1731382968.git.zhengjunjie@iscas.ac.cn
* gnu/packages/freedesktop.scm (libqmi): Update to 1.34.0.
[inputs]: Add bash-completion.
[propagated-inputs]: Add libmbim and libqrtr-glib.
[native-inputs]: Add gobject-introspection 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 | 38 +++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 14 deletions(-)

Toggle diff (54 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 1a192f0a806..a3dc92108ec 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1971,23 +1971,33 @@ (define-public libqrtr-glib
(define-public libqmi
(package
(name "libqmi")
- (version "1.30.8")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://www.freedesktop.org/software/libqmi/"
- "libqmi-" version ".tar.xz"))
- (sha256
- (base32
- "140rmjw436rh6rqmnfw6yaflpffd27ilwcv4s9jvvl1skv784946"))))
- (build-system gnu-build-system)
+ (version "1.34.0")
+ (source
+ (origin
+ (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
+ "1m5y2sf14qd2i9mvbb68wxqlfwvpiprgz8zmcx6wb2cnjgsszmwp"))))
+ (build-system meson-build-system)
(inputs
- (list libgudev))
+ (list
+ bash-completion
+ libgudev))
(native-inputs
- (list `(,glib "bin") ; for glib-mkenums
- pkg-config python-wrapper))
+ (list `(,glib "bin") ;for glib-mkenums
+ gobject-introspection
+ help2man
+ pkg-config
+ python-minimal))
+ ;; These are required by qmi-glib.pc.
(propagated-inputs
- (list glib)) ; required by qmi-glib.pc
+ (list glib
+ libmbim
+ libqrtr-glib))
(synopsis "Library to communicate with QMI-powered modems")
(home-page "https://www.freedesktop.org/wiki/Software/libqmi/")
(description
--
2.46.0
Z
Z
Zheng Junjie wrote on 12 Nov 04:46 +0100
[PATCH v2 4/4] gnu: modem-manager: Update to 1.22.0.
(address . 73981@debbugs.gnu.org)
f7c0873c22e2e26a36949efc954514211c912ac1.1731382968.git.zhengjunjie@iscas.ac.cn
* 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(-)

Toggle diff (68 lines)
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
Z
Re: [bug#73981] [PATCH v2 0/4] update modem-manager and deps
(address . 73981-done@debbugs.gnu.org)
87o72gpy11.fsf@iscas.ac.cn
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (13 lines)
> 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 | 148 +++++++++++++++++++++++++----------
> 1 file changed, 105 insertions(+), 43 deletions(-)
>
>
> base-commit: b790db7589858fc77989b4d1f369c52bca6d6e7c
> prerequisite-patch-id: f66cd2a9b573a4b884f66abe5e92465d04e1ebd6
> prerequisite-patch-id: 148cdb72f12b8fae6e0b3cc2f9f691186c959593
pushed, closing.
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmc3KHoACgkQO1qpk+Gi
3/Cedg/+PJBTLA0e9BXCv1Pf7pEgxLFKfeRmu3eOLZRzEuzhQnLj5aFzOd4JpDJ+
Afc69Kfg2xTz2Gu2NgjnnbrVhyU/2s4RVXh5ZTnrYGt3LGzsdv6tbHWvkf9DiN/F
nXHafZ0yL6FX6+6DNJT2lDH/Nfx0OrSIHxeBnjMXhkyrRkHEDXYvRpKBtkaJLwab
ALh4at3Wi9TRZ4P9bC5xMU4DqaN/dhj83Y1qx8scnXv9K0CUNI4gPRAxm4xlV926
IJuNFl5S6OqAcxXEMBnhwwxT6hEZEnm+UspD2RJSugG3DQ2LVu7BxbpQv4K9+v5w
XnOT1IhMUBYSWvEP4A5C5G/GOutIb0qEyayhTmSY/9JlcHqRzwhnhcl/L++bXHIH
grqO88ycf8kwjxmLO9mHHc8bIWKq2qoTsdA+jlt0KsJiQeEetppyYfrNBmUibLNi
f7QWO6OfuztO66nvRYMNKslqNgiLKKHRAZ8pD6p0I5FDbcZP/BaSRK6I0kdRGX6I
e22+ERHel0oycUpTbch0KTe+OsziIoaAugdYykexk5OYl1W1z9qQfRnbRAqfmCZF
dPXavuZrcqi31bTV9sjsYpb9o82QwxFKGokF7AF8iFW8yG+64YLcQ/tLa6yVeJ/r
Q2HGQqTGmbDlfOqCRjKn7ftIitZ21j864vXrbiaQL4xh2/w8vxs=
=5r0G
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 73981@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 73981
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch