From patchwork Tue Sep 19 11:32:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 54428 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 9287B27BBEA; Sat, 30 Sep 2023 15:25:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 D1E9927BBE2 for ; Sat, 30 Sep 2023 15:25:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmatq-0003dl-1s; Sat, 30 Sep 2023 10:24:54 -0400 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 1qmatm-0003cu-D9 for guix-patches@gnu.org; Sat, 30 Sep 2023 10:24:50 -0400 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 1qmatj-0004Bk-PN for guix-patches@gnu.org; Sat, 30 Sep 2023 10:24:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qmatz-0004mN-5Y for guix-patches@gnu.org; Sat, 30 Sep 2023 10:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66099] [PATCH gnome-team v3 3/3] gnu: upower: Update to 1.90.2. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Sep 2023 14:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 66099@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 66099-submit@debbugs.gnu.org id=B66099.169608386018290 (code B ref 66099); Sat, 30 Sep 2023 14:25:03 +0000 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 14:24:20 +0000 Received: from localhost ([127.0.0.1]:59616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmatI-0004kr-3k for submit@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:20 -0400 Received: from planete-kraus.eu ([89.234.140.182]:42088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmatD-0004kB-BO for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 10:24:15 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1fcf6b8d; Sat, 30 Sep 2023 14:23:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniA; bh=R doyfZW9C24IvHXLgbzW4siEHvA=; b=fGymF4fI96RBul03JygVfCzNPgo6b6EVz NWiLFZk8ACGnWeuNX5gTpaskKiPhxxD+5YBn/1IZ2JG8dNCvPesHdMHDuQbs5yYA Hc+0ME01Pau0hK04QZ1HaUD01PLV1oF09DLKlFPdX0cva4U2sQdar8GHkOxeK0qa vp7KW3mD8lumEFQ+A+v6YtIBE1e6+P4PdJqXp5iRUOlA0u21PiNh1ZMSkM8rfDcW n4G59Lc+y4M53mDZ7DM5bH2/iUFIszEO/t2KunrBBb05B3BL3DqIDp1Nw8PR6z5q k2I+WtWwHdmLWYSa2oUjYQCYJuSgpq5x80GWkbBOWs1Er5Zpja0lA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a7baf7ab (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 14:23:58 +0000 (UTC) Message-ID: <30b94b124745c3bbb33fc042e766ce57f1ac8005.1696083614.git.vivien@planete-kraus.eu> In-Reply-To: References: , Date: Tue, 19 Sep 2023 13:32:46 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 The new eudev now can install hwdb files. Upower has some, but they should get installed in upower’s output, not eudev’s. The phases needed a rework. Now the 32-bit-specific test fix is always there, except it may be empty. A test needs to be disabled. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable the test. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..76018a4b5e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; This test calls an unimplemented bluez dbus method + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")))) + (add-after 'unpack 'adjust-test-for-excess-precision + (lambda _ + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '(*unspecified*))))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection