From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 PjEbAnFUB2WaZAAAG6o9tA:P1 (envelope-from ) for ; Sun, 17 Sep 2023 21:33: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 mp10.migadu.com with LMTPS id PjEbAnFUB2WaZAAAG6o9tA (envelope-from ) for ; Sun, 17 Sep 2023 21:33:05 +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 A0A063EBC0 for ; Sun, 17 Sep 2023 21:33:04 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="P MvwAH9"; 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=1694979184; a=rsa-sha256; cv=none; b=BReouKMEjIlRkiwou43TPTIb7A7eP9G4l//FOl2IXFqTqibvvHj1U+rdh5pA3FiRu1p5fS cNGYrzrIXt7x0g9PkTNkFkvgGxIB/os8OLRP41lzPRB1fxfL2FA4jDqoiLdDFtEsaDu6+N UonG3S8+3FsidHpUh9ul03CdsK6ZRzSPuXHnFwIitaAdXLQS1IqhT/f4PrZ4shTWRmANFE hcUx7A6s81I2maEDnzpe62Bz6M2z6XuRYIu638Bk4Ph09qDPvI/iOO4BbopCrbw0TKLrIO yi8oqlv6P431BHNQJalvCW7DW8ruLA6FiJwB6tqGodg1G2oG28lOWiBYNcDA0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694979184; 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: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=tmrNkJ/AcSXAZb8jx3H1K9UiHDT8/OI/PNGJ3MsJLu8=; b=Cm3pSwhLHLItICpYdCGOYY/gINZ4eLAhvcCLxGaQ7dJRs/LqzTcOzqGKDPzk5IoCYK8riO nDNWCo3mwVXkxxyxHrsFXgKdDb4Pm2oX5dZYUFFq3V4fyibZYvOm9/NA0b4qlgS45+MM8K MDRpKyihGqJ4kSZ329czOvT5cr1/Dh+suzr/p4s9Ff2l5+aI01mPfZJrHoN3BstyT7oreM oHc3Bqq9e12wWfRVlR0jjoigJCIHoGfLNQRuZabaA2rI1CgPYidUitqnLV+VUJh1n4SiI4 0uRu7pvop4ejma3FN7fuNhGtXD6I+hr3aMGbyldQNIkuZ2AeEqdRXEcfRU/92w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="P MvwAH9"; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxVn-0006GV-Su; Sun, 17 Sep 2023 15:32:55 -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 1qhxVm-0006G6-8I for guix-patches@gnu.org; Sun, 17 Sep 2023 15:32:54 -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 1qhxVm-0001w2-0N for guix-patches@gnu.org; Sun, 17 Sep 2023 15:32:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxVt-0001Xz-Nd for guix-patches@gnu.org; Sun, 17 Sep 2023 15:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66052] [PATCH gnome-team v4] gnu: tracker: Update to 3.6.0. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 66052@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 66052-submit@debbugs.gnu.org id=B66052.16949791785939 (code B ref 66052); Sun, 17 Sep 2023 19:33:01 +0000 Received: (at 66052) by debbugs.gnu.org; 17 Sep 2023 19:32:58 +0000 Received: from localhost ([127.0.0.1]:51478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxVq-0001Xi-GG for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:32:58 -0400 Received: from planete-kraus.eu ([89.234.140.182]:55478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxVm-0001XS-Gf for 66052@debbugs.gnu.org; Sun, 17 Sep 2023 15:32:57 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id fdad7747; Sun, 17 Sep 2023 19:32:44 +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:to:cc :mime-version; s=albinoniA; bh=fCRbKPNLUrb08voIDNfQnxxeeOw=; b=P MvwAH9iBSTiZsrJn4waEz4Mws/DZTBporiWIxCLXVIhLO3AcdLX1O5aZJG/raLmQ 71mDcjx80DbQ7/F6OXw5R+uEhjTHpCbH7rTJircpB3GatBRVtskN1F2rmyK8LB/A b/SoTvE/VchafxfzW7Cl/qvw2aKvpNyiG+BjUFIVE1uB3YWI1w6ClQJvyQfTN+Vv J5iqnyZ1Ha+JgC5/Pue6r6kBGPveuPTqe/PXT4wE9FZ2qojR3MDk9pno0m8FWvI8 GJLcskxuyqNI+zLn06s3LgUgGEiekZgpsXs4ptsQ43JwlgMDcya8mrJ4GUPhKz74 68xuz5IHbBxbNh9e7CD1w== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 246dd50b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 17 Sep 2023 19:32:44 +0000 (UTC) Message-ID: In-Reply-To: <79a0085fc5b4c27bef6d3d811ab40a9b6f752447.camel@gmail.com> References: <79a0085fc5b4c27bef6d3d811ab40a9b6f752447.camel@gmail.com> Date: Sun, 17 Sep 2023 13:29:18 +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 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: -5.20 X-Spam-Score: -5.20 X-Migadu-Queue-Id: A0A063EBC0 X-Migadu-Scanner: mx2.migadu.com X-TUID: loUaDk34aDCm * gnu/packages/gnome.scm (tracker): Update to 3.6.0. [#:phases]: Add 'disable-failing-tests'. --- > You don't need the clunky #t if you use and True. Thank you, I did not think of that. > but I'm sure there are other places that already have such logic to copy > from with more idiomatic code. Case in point: glib, which has patches for > i686 and hurd. I can do the same as glib, but then on x86_64, where nothing is spliced in, the phase becomes `(lambda _)' which is a syntax error in Guile (lambdas must have at least one item in body). I can do the "and" trick, or do as glib and write '("Nothing to do :)") in the not-x86-32 branch of the if instead of '(). What would be best? In the mean time, here is the cheapest change: use the "and" trick. gnu/packages/gnome.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2077478ff2..d344d2830c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9387,7 +9387,7 @@ (define-public gnome-autoar (define-public tracker (package (name "tracker") - (version "3.5.3") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker/" @@ -9395,7 +9395,7 @@ (define-public tracker "tracker-" version ".tar.xz")) (sha256 (base32 - "1vi878f95a2nlvqz46ph6f05hywjb2ni0znqavhdkrbvi6qchrhl")))) + "1whdqidxmagsc35pmz9kcc5vs3bmvbkmnis7prnx3zxs37z2qnaj")))) (build-system meson-build-system) (arguments (list @@ -9417,6 +9417,21 @@ (define-public tracker (substitute* "utils/trackertestutils/__main__.py" (("/bin/bash") (search-input-file inputs "bin/bash"))))) + (add-after 'unpack 'disable-failing-tests + (lambda _ + #$(and (target-x86-32?) + ;; On 32-bit systems, the far away dates are incorrect, + ;; and the floats are not parsed exactly. + #~(begin + (substitute* + "tests/libtracker-sparql/tracker-statement-test.c" + (("g_assert_cmpfloat *\\((.*), ==, ([0-9.e-]+)\\);" + total actual expected) + (string-append "g_assert_cmpfloat_with_epsilon (" + actual ", " expected ", 1e-12);"))) + (substitute* "tests/core/tracker-sparql-test.c" + (("\\{ \"datetime/direct-1\", .* \\},") + "/* datetime test disabled */")))))) (add-before 'configure 'set-shell (lambda _ (setenv "SHELL" (which "bash")))) base-commit: e9ff5d51e3297089e66c124195e1f1b42dbded65 -- 2.41.0