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: 54425 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 E363D27BBEA; Sat, 30 Sep 2023 11:48:15 +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 DDCDA27BBE9 for ; Sat, 30 Sep 2023 11:48:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmXVn-0007aW-K5; Sat, 30 Sep 2023 06:47:51 -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 1qmXVl-0007YF-AV for guix-patches@gnu.org; Sat, 30 Sep 2023 06:47:49 -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 1qmXVj-0003xf-Aq for guix-patches@gnu.org; Sat, 30 Sep 2023 06:47:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qmXVy-0003lN-KR for guix-patches@gnu.org; Sat, 30 Sep 2023 06:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66099] [WIP PATCH gnome-team v2 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 10:48:02 +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.169607084714308 (code B ref 66099); Sat, 30 Sep 2023 10:48:02 +0000 Received: (at 66099) by debbugs.gnu.org; 30 Sep 2023 10:47:27 +0000 Received: from localhost ([127.0.0.1]:57792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVP-0003ig-5C for submit@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:27 -0400 Received: from planete-kraus.eu ([89.234.140.182]:48792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmXVG-0003hw-LX for 66099@debbugs.gnu.org; Sat, 30 Sep 2023 06:47:19 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 0854ba00; Sat, 30 Sep 2023 10:47:00 +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=H GiP9DJaqlkBpu3ZlC5b+zWqZ/A=; b=e6Atx5ZGbrXMLlCnFFarKO0UBhITgH29v ihQAGcXPKJcxJCPWdul/cCOcObjfli+b8DomkJU5+kB3eqQjZujw4PE13QaFyNdx JOmuh/zOQCfRyVC7KlW6WH6eHxxUyJSvGL/9twZljgrgwr8IITkFUn6VHyCTLu/S qQMSgM8V5R61aV0aJOOuo9qszoLtaBG71HAmT/rmTIin7LsQuFr4sLnwSbVuM4q5 iINkn53jam9MPf0mbJrRBxj8U9H5jx5HAkxXl6qWO7gxBN4N8nhrBTzD8kgzHqCx USNicZRXNTe1MAruGvDwYR2nGxTwh7BAqmdLYl87XZVabhA1PJO/Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 269b99b9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Sep 2023 10:46:59 +0000 (UTC) Message-ID: <4b7bd62cdef6986e0d659816ada6cb0bf3d60cdc.1696070591.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. Upower tests now requires that upower-provided hwdb files be installed. So I call udevadm hwdb --update first. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Move it after 'install, and call set up hwdb first. --- gnu/packages/gnome.scm | 52 ++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..0c240dbb9a 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 '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*)))) + (delete 'check) ;; move after the install phase + (add-after 'install 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + (setenv "UDEV_HWDB_PATH" + (apply string-append #$output "/lib/udev/hwdb.d" + (let ((p (getenv "HWDB_BIN_PATH"))) + (if p + (list ":" p) + '())))) + (let ((hwdb.bin (string-append (getcwd) "/test-hwdb.bin"))) + (invoke "udevadm" "hwdb" "--update" + "-o" hwdb.bin) + (setenv "UDEV_HWDB_BIN" hwdb.bin)) + (setenv "MESON_TESTTHREADS" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (invoke "dbus-run-session" "--" + "meson" "test" "-t" "0"))))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection