From patchwork Mon Nov 11 06:17:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 70248 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5AA1D27BBE9; Mon, 11 Nov 2024 06:25:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E4A3127BBE2 for ; Mon, 11 Nov 2024 06:25:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANqN-0002Vn-8s; Mon, 11 Nov 2024 01:24:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tANqK-0002Sv-Fk for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tANqK-0007AT-72 for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=yTLP5CKlc/MdIwNSWrYUB8+TIXKNKaQLvIjgvHtaqMk=; b=Hx8wBtb2c9WwIFrp+PuqJcAaDNirE0Ykt7l83ElGLCFOjyRwP4dxkOdIfePsIBh4a55lt7mx6LH+yG7Pphw6cqBpXvaXKVFk5qPkQAPLSQ6t5HAVqX8RINE9QIqTS6Txl693aPQtH52SAErk+0PPUzrTTSFC5xy6iXyipVzBRQv2N9BMEErbWs4Fq9VfjbmiYlYYvjzvqvtqyTQW5tbkNQLrglFWrQCA+x0ubspoqOTC1xo2CYNyVVjeuYvHjzTAzO4fMi/GgTNBp4tDKG6HmJKNnnV4khVVo4Hr34EDsZOPzTBNsAgL7negqV/wO6gJf/q8gEar3nXWHvxHnRM4hA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANqK-0006Im-1I; Mon, 11 Nov 2024 01:24:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74306] [PATCH gnome-team 25/44] gnu: modem-manager: Update to 1.22.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 06:24:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74306@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74306-submit@debbugs.gnu.org id=B74306.173130622223977 (code B ref 74306); Mon, 11 Nov 2024 06:24:08 +0000 Received: (at 74306) by debbugs.gnu.org; 11 Nov 2024 06:23:42 +0000 Received: from localhost ([127.0.0.1]:57696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANpu-0006EX-42 for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:42 -0500 Received: from mail-oi1-f178.google.com ([209.85.167.178]:47412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANpr-0006Dr-2s for 74306@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:40 -0500 Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3e5fef69f2eso2327462b6e.3 for <74306@debbugs.gnu.org>; Sun, 10 Nov 2024 22:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731306153; x=1731910953; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yTLP5CKlc/MdIwNSWrYUB8+TIXKNKaQLvIjgvHtaqMk=; b=fpjZ3immw6m6xqUh2kPowZb2K7poI/EByYKDI9uLXVpfW06D3rSEoC4I0zHEHgG+9F 9pxdcA2/+mRWOD6HF2Xc+0DenkhviK40FWGYjjQ7yCJNUERikpfGhAz5h7MLpwl8GMki OK/4XCqRagBgZJ75Ga0h+bNSlDI/k6ooPs+/fDzdwV59Wt/DIHx/WseW+HEQXpCLiwzh pPct6Kl68GHDlwhzxsaXycRM38xIeY/cJgfgpvQbxN6hZxSctCjXeIRipe8PxpWG5GFl sZquTn7q0oUbgWFQyGo2mvWnqqruyx+9bOVHX04xlf8BTClmbxU5j6RzG1yayIGsAKTH jCbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731306153; x=1731910953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yTLP5CKlc/MdIwNSWrYUB8+TIXKNKaQLvIjgvHtaqMk=; b=jDfBbU26jNAUS8CV45pPOgv+LFubWdP0ohQvmsrGaOuxf3jUoZh/ns+7EBqEfeNqMm H327PwqADC/Ic4cv2j9ySRd0/nMLObU9YaGqqhdyxtm06twmQojpXL2rU1gnoekchQNY 1IjU7elM5V7z2AqfTx8uhX83CgYBpHp8w1uSRwU5CPeceTsw86ILDPUSuccqkna9gAW4 53NZTik14x/ggALuwIIx+Z4by4nO98PE/oSneCK5lfynlt6LAlCfZAuhat2NXXI196CP N1Gsi5QoQY5yYbZrGCUWHg9OSJkIH58jn8Lm5uvTmyU6gG+lo2XkY1EBrrmVoDUgaKRA vc9g== X-Gm-Message-State: AOJu0YxZ+JPa/4td/hNWmFMLrk95z3mZlWJoi9Y1nfxpYyBoCj8pTf7A te9nbMok2CF/hCR/1Pj1w29ShfBpVHWsjNPMt88MXBej3qQbJIvf9NM75g== X-Google-Smtp-Source: AGHT+IG+yQcdj7vNf469GtjeYau/bGy5MW5pzoRmFqsOw8QjYORo6ugnuVtko8P7d3VVdSHWth3elA== X-Received: by 2002:a05:6808:2f17:b0:3e3:9b23:98fd with SMTP id 5614622812f47-3e794692e92mr10195908b6e.23.1731306153121; Sun, 10 Nov 2024 22:22:33 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7f41f5ea0d5sm7782996a12.47.2024.11.10.22.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 22:22:32 -0800 (PST) From: Maxim Cournoyer Date: Mon, 11 Nov 2024 15:17:08 +0900 Message-ID: <3bd5cf8d3ca8f90cf56a0cdeed2e3bf15cd0eeb8.1731303037.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (modem-manager): Update to 1.22.0. [source]: Fetch via git. Apply patch. [build-system]: Switch to meson-build-system. [arguments]: Adjust #:configure-flags for new build system. [native-inputs]: Add libxslt. [inputs]: Add bash-completion and elogind. * gnu/packages/patches/modem-manager-typelib.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ib73001bbf72044f6803a7e36b426832c153c28d7 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 40 ++++++++++++------- .../patches/modem-manager-typelib.patch | 12 ++++++ 3 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 gnu/packages/patches/modem-manager-typelib.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2959c2a835..e03dfc9078 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1799,6 +1799,7 @@ dist_patch_DATA = \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mpg321-CVE-2019-14247.patch \ %D%/packages/patches/mpg321-gcc-10.patch \ + %D%/packages/patches/modem-manager-typelib.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \ %D%/packages/patches/mosaicatcher-unbundle-htslib.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index aa41d3c329..1c001e8800 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2060,20 +2060,24 @@ (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")) + (patches (search-patches "modem-manager-typelib.patch")))) + (build-system meson-build-system) (arguments - (list - #:configure-flags - #~(list (string-append "--with-udev-base-dir=" #$output "/lib/udev")))) + (list #:configure-flags + #~(list (string-append "-Dudevdir=" #$output "/lib/udev/rules.d") + "-Dsystemdsystemunitdir=no" + "-Dvapi=true"))) (native-inputs (list dbus gettext-minimal @@ -2083,11 +2087,17 @@ (define-public modem-manager python python-dbus python-pygobject - vala)) + vala + libxslt)) ;for xsltproc (propagated-inputs (list glib)) ;required by mm-glib.pc (inputs - (list libgudev libmbim libqmi polkit)) + (list bash-completion + elogind + libgudev + libmbim + libqmi + polkit)) (synopsis "Mobile broadband modems manager") (home-page "https://www.freedesktop.org/wiki/Software/ModemManager/") (description diff --git a/gnu/packages/patches/modem-manager-typelib.patch b/gnu/packages/patches/modem-manager-typelib.patch new file mode 100644 index 0000000000..848b653d77 --- /dev/null +++ b/gnu/packages/patches/modem-manager-typelib.patch @@ -0,0 +1,12 @@ +Upstream-status: https://gitlab.com/linux-mobile-broadband/ModemManager/-/merge_requests/1 + +diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in +index fb8cd5e8d..f1a8ae38c 100755 +--- a/tools/tests/test-wrapper.sh.in ++++ b/tools/tests/test-wrapper.sh.in +@@ -2,4 +2,4 @@ + + # For debugging behavior of test-modemmanager-service.py, you can modify + # this line to add --log-file option +-LD_LIBRARY_PATH=@abs_top_builddir@/libmm-glib GI_TYPELIB_PATH=@abs_top_builddir@/libmm-glib @abs_top_srcdir@/tools/test-modemmanager-service.py ++LD_LIBRARY_PATH=@abs_top_builddir@/libmm-glib GI_TYPELIB_PATH=@abs_top_builddir@/libmm-glib:$GI_TYPELIB_PATH @abs_top_srcdir@/tools/test-modemmanager-service.py