guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#66052] [PATCH gnome-team v3] gnu: tracker: Update to 3.6.0.


From: Vivien Kraus
Subject: [bug#66052] [PATCH gnome-team v3] gnu: tracker: Update to 3.6.0.
Date: Sun, 17 Sep 2023 13:29:18 +0200
User-agent: Evolution 3.46.4

* gnu/packages/gnome.scm (tracker): Update to 3.6.0.
[#:phases]: Add 'disable-failing-tests'.
---

> > > You can (and probably should) make this into a ‘disable-failing-
> > > tests’ or inline it into an existing one.  Otherwise LGTM but
> > > waiting for CI to test.
> > 
> > This is only for i686, I want to keep all tests for x86_64. So, it’s
> > named 'disable-i686-failing-tests'.
> > 
> > I would not hold my breath for CI. Looking at the qa-frontpage
> > repository, I suspect the base for all QA builds is always master (it
> > invokes "git tag base-for-issue-*" without a specific branch name),
> > so it will likely fail.
> Fine by me.  Not sure whether we'll need to distinguish failing tests
> like that in the future or chain multiple ones after another (there is
> precedent to putting them all in one phase and we are already
> rebuilding tracker, so we might also have a phase that reads
> *unspecified* on arches that don't need any fixes, but who am I to
> insist on that).

Sorry, I’m not sure I understood everything. Is this more what you expected?
I’m not sure about the *unspecified* thing. If I drop the "else" leg of the
conditional, I get:

    guix build: error: #<unspecified>: invalid G-expression input

Same if I replace the "if" with a "when".

So, the phase does not read *unspecified* if no fix is needed, it reads #t
instead.

 gnu/packages/gnome.scm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2077478ff2..422d6de28f 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.
+                    #~(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 */")))
+                    #~#t)))
           (add-before 'configure 'set-shell
             (lambda _
               (setenv "SHELL" (which "bash"))))

base-commit: e9ff5d51e3297089e66c124195e1f1b42dbded65
-- 
2.41.0





reply via email to

[Prev in Thread] Current Thread [Next in Thread]