GNU bug report logs - #66052
[PATCH gnome-team 0/1] Update tracker, and ignore i686 missing tests

Previous Next

Full log

Message #26 received at 66052 <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 66052 <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com
Subject: [PATCH gnome-team v4] gnu: tracker: Update to 3.6.0.
Date: Sun, 17 Sep 2023 13:29:18 +0200

* 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.