From patchwork Sun Sep 17 11:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 17064 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 BD29627BBE9; Mon, 18 Sep 2023 06:05:06 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 A028E27BBE2 for ; Mon, 18 Sep 2023 06:05:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qi6RM-0004AY-Bf; Mon, 18 Sep 2023 01:04:56 -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 1qi6RK-0004AJ-VI for guix-patches@gnu.org; Mon, 18 Sep 2023 01:04:55 -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 1qi6RK-0006i5-NF for guix-patches@gnu.org; Mon, 18 Sep 2023 01:04:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qi6RS-0001RJ-Ef for guix-patches@gnu.org; Mon, 18 Sep 2023 01:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66052] [PATCH gnome-team v5] gnu: tracker: Update to 3.6.0. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 05:05:02 +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.16950134695487 (code B ref 66052); Mon, 18 Sep 2023 05:05:02 +0000 Received: (at 66052) by debbugs.gnu.org; 18 Sep 2023 05:04:29 +0000 Received: from localhost ([127.0.0.1]:51859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qi6Qu-0001QQ-Tb for submit@debbugs.gnu.org; Mon, 18 Sep 2023 01:04:29 -0400 Received: from planete-kraus.eu ([89.234.140.182]:49736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qi6Qp-0001QC-38 for 66052@debbugs.gnu.org; Mon, 18 Sep 2023 01:04:27 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 3e00fbf0; Mon, 18 Sep 2023 05:04:12 +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=e6WPe5NoAM7tso1qea9OdQ2i1mQ=; b=T Q0/PQyO0BxNqixFiCd3Kx6HR6Tg/x/2z4lCCnozV6G5UeVDB5XgMuynSU+D6gcPZ cVFH6HyBfCSvE/pTMq/kJh196NAwXgvusnx5wVrOCARj+2d4W1pdpMjC2M4gr9IJ +BIPPnKwNFsNrRVTp5/vkMldqJ+uEZVN7/YMaxAE1yQ+2twF8WMd/29/nMmugPLS Mm4+ZabFMh+ABk16furHWk0o2owZy/d3KhhDOPcXvOtZoUip9tqzOaqDBSTOT0zV DcQiA4l0XPVHFcprl17E8yffwqxvSiA6r6d05kNqDFW5ZLMTEPJxU58n+FptpPYW DyEi0ZS9Dt1wZAdoL+KIA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ec022d5b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 18 Sep 2023 05:04:12 +0000 (UTC) Message-ID: In-Reply-To: <800d89ee93edfcb461862e2daa3217b7e9fc1c8b.camel@gmail.com> References: <800d89ee93edfcb461862e2daa3217b7e9fc1c8b.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 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 * gnu/packages/gnome.scm (tracker): Update to 3.6.0. [#:phases]: Add 'disable-failing-tests'. --- > > 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). > > […] > And that's where my original comment with unspecified comes back in. If you > add *unspecified* after a bunch of conditional code that may or may not get > expanded, you will at least not have an empty body :) Ooh, now I get it. I finally understand that *unspecified* is an actual value in Guile. I’m sorry and a bit embarrassed it took that long. So, something like that? gnu/packages/gnome.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) base-commit: e9ff5d51e3297089e66c124195e1f1b42dbded65 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2077478ff2..87d208bcd2 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,22 @@ (define-public tracker (substitute* "utils/trackertestutils/__main__.py" (("/bin/bash") (search-input-file inputs "bin/bash"))))) + (add-after 'unpack 'disable-failing-tests + (lambda _ + #$@(if (target-x86-32?) + ;; On 32-bit systems, the far away dates are incorrect, + ;; and the floats are not parsed exactly. + '((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 */"))) + '()) + *unspecified*)) (add-before 'configure 'set-shell (lambda _ (setenv "SHELL" (which "bash"))))