From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WMG4N5TdHWUp2gAA9RJhRA:P1 (envelope-from ) for ; Wed, 04 Oct 2023 23:48:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id WMG4N5TdHWUp2gAA9RJhRA (envelope-from ) for ; Wed, 04 Oct 2023 23:48:04 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9BADD41083 for ; Wed, 4 Oct 2023 23:48:04 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b=x8OVLcWT; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696456084; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=f9J4fERYOVlRL9mNTgybIDoHELln/XIisCM91eeVzkQ=; b=K5Ojjt+fjdJn7Utu0acfkhdYEw92mgz6qU8gJkTrjXdjZuYGCSFO5excbkzRX4+bB3JN7/ b36GKohYZh3BN8wdji8ICcRTkdkZXE82AipMwCWBGEafPWEw7FXIQWaqtj0R/ku/6fisTe qML0V3leY6BcR0RMfopNjxd4ZULAmAn1b26Ws1nH4khuwLiGOQjEvVkt28KmhQjW62LBtA WLPsOA7kN8ZlUs637usZOeVnlqChRJTTZjT9/heK3dolzpkGlbyCdh4wwcpAxrVqpHi74V kLxFa09fvhjNkz0ULjeNeb2Q9m/iEym46zPv3amJGM8ctlZ/1aU0SdM84hhKow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b=x8OVLcWT; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696456084; a=rsa-sha256; cv=none; b=IxBpdAwzDpw23JLnmXH7JNIyz3XSjHCVpyhOFuo9G4O+2ZdnpSoV0/qX4KLNdHVtkeKou2 t63/nBPy0ouyBuEMZvC6Ktw+f1mBt5TuEqnmQivg/+VGm12AMghfO5jwBTZtHgIVOSv9t0 lo797vpY4aq2neEzc97MZTqSR/ttZcYAYbJcQFo5RX/6gD3XUr/o6YvCjustf5mpBo39ZN vt3BsYhEWujWwlqWZGi0dUgwO+ghIQS5M1HW5DWqyd/6MSSyo7RcMjvSYKX4bncy5/4vcQ tnrBbnEO27yJ9GB9xfrcAsPipEtrOXBK0T09y5PMdKZaq0S8NXOdYR1bD13jqA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qo9id-0007G1-UE; Wed, 04 Oct 2023 17:47:47 -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 1qo9ib-0007EL-Ig for guix-patches@gnu.org; Wed, 04 Oct 2023 17:47:45 -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 1qo9ib-0000JN-AL for guix-patches@gnu.org; Wed, 04 Oct 2023 17:47:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qo9it-0005F3-4a for guix-patches@gnu.org; Wed, 04 Oct 2023 17:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66099] [PATCH gnome-team v6 5/5] gnu: upower: Update to 1.90.2. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Oct 2023 21:48: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 , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 66099-submit@debbugs.gnu.org id=B66099.169645605020047 (code B ref 66099); Wed, 04 Oct 2023 21:48:03 +0000 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:47:30 +0000 Received: from localhost ([127.0.0.1]:45504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9iM-0005DH-86 for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:30 -0400 Received: from planete-kraus.eu ([89.234.140.182]:57424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9iJ-0005D8-U7 for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:47:28 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9ba36648; Wed, 4 Oct 2023 21:47:09 +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=albinoniB; bh=U 4Q95r5OzDlerBhawFCb592wjQg=; b=x8OVLcWTg0kk942fWgbBfeVz8VtwgkPtw QDaFaGv2uNf9NnjRxCVEe3OZypTslL5xzQ2/tLxdtTUSVOcGx1dVJMM+q7GyPIyX A+DNWQ6mZB28iUChd6r96k65j3se7PHXs0HepeRVPc8KjhHm0s8uy7/ZaZmt6pA4 /IMlKWs59khhLN0FvWiXZpqQYs1Y2Ik0fU3Uaa2wywkD0oCjf8ANzfmv18/O40Jq Y7uUADWKk7iLmisIBDvLs2cvUoB+HjLgYOQuVyPCp882vNY+hY+x1GUeSK6T3ue8 bO/fK+n6meVvDd+dfDPcvaCpfllQH3uHncyRx7hoSxCSKXtNUey4w== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id dfd99cc3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:47:09 +0000 (UTC) Message-ID: <462502fb5334412e329a91c6e906bd09571b650f.1696455423.git.vivien@planete-kraus.eu> In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> Date: Tue, 19 Sep 2023 13:32:46 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.19 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 9BADD41083 X-Spam-Score: -4.19 X-TUID: Zsz5c12DlMFb 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. test_bluetooth_hidpp_mouse fails, after calling into a bluez dbus method. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea3dc455a..3f773aae8a 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-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(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")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- 2.41.0