[bug#71599] [PATCH gnome-team 0/2] Update Tracker

[bug#71599] [PATCH gnome-team 0/2] Update Tracker

[Liliana Marie Prikler]

Hi Guix,

this series updates tracker and tracker-miners (soon to be TinySPARQL and
localsearch) to their most recent versions.  From what I can see, this could
possibly also go to master, but it does influence at least one webkit, so
I'd rather not cause a rebuild.

Cheers

Liliana Marie Prikler (2):
  gnu: tracker: Update to 3.7.3.
  gnu: tracker-miners: Update to 3.7.3.

 gnu/packages/gnome.scm | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)


base-commit: 2195f70936b7aeec123d4e95345f1007d3a7bb06
-- 
2.45.1

[bug#71599] [PATCH gnome-team 1/2] gnu: tracker: Update to 3.7.3.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (tracker): Update to 3.7.3.
[#:phases]: Drop ‘unwrap-libexec’.
---
 gnu/packages/gnome.scm | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e910e125d2..d7a8f12550 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9643,7 +9643,7 @@ (define-public gnome-autoar
 (define-public tracker
   (package
     (name "tracker")
-    (version "3.6.0")
+    (version "3.7.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker/"
@@ -9651,7 +9651,7 @@ (define-public tracker
                                   "tracker-" version ".tar.xz"))
               (sha256
                (base32
-                "1whdqidxmagsc35pmz9kcc5vs3bmvbkmnis7prnx3zxs37z2qnaj"))))
+                "1yfi53fpfszfjajrqf1g80cri472k6wxpxj6g3nwa13yjd84lgdb"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -9705,18 +9705,7 @@ (define-public tracker
                 ;; Some tests expect to write to $HOME.
                 (setenv "HOME" "/tmp")
                 (apply invoke "dbus-run-session" "--" "meson" "test"
-                       "--print-errorlogs" test-options))))
-          (add-after 'glib-or-gtk-wrap 'unwrap-libexec
-            (lambda* (#:key outputs #:allow-other-keys)
-              (with-directory-excursion (string-append (assoc-ref outputs "out")
-                                                       "/libexec/tracker3")
-                (for-each
-                 (lambda (f)
-                   (let ((real (string-append "." (basename f) "-real")))
-                     (when (file-exists? real)
-                       (delete-file f)
-                       (rename-file real f))))
-                 (find-files "."))))))))
+                       "--print-errorlogs" test-options)))))))
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")
-- 
2.45.1

[bug#71599] [PATCH gnome-team 2/2] gnu: tracker-miners: Update to 3.7.3.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (tracker-miners): Update to 3.7.3.
[#:configure-flags]: Add “-Dlandlock=disabled”.
---
 gnu/packages/gnome.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d7a8f12550..ce20262d2d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9766,7 +9766,7 @@ (define-public tracker
 (define-public tracker-miners
   (package
     (name "tracker-miners")
-    (version "3.6.1")
+    (version "3.7.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker-miners/"
@@ -9774,7 +9774,7 @@ (define-public tracker-miners
                                   "/tracker-miners-" version ".tar.xz"))
               (sha256
                (base32
-                "13ljx0birrav728ik3bnlwzgas8q6rbhjbvxp7zzwy6ambafiw7f"))))
+                "1zm57pih7csgipw3w2b1sgadvfszik70sbz4gr5pn6aw9caqhhz7"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
@@ -9784,6 +9784,10 @@ (define-public tracker-miners
              (string-append "-Dc_link_args=-Wl,-rpath="
                             (assoc-ref %outputs "out")
                             "/lib/tracker-miners-3.0")
+             ;; TODO: Check if this is only a build-time failure,
+             ;; or add variants to explicitly enable this features, see also
+             ;; <https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/300>.
+             "-Dlandlock=disabled"
              ;; TODO: Enable functional tests. Currently, the following error
              ;; appears:
              ;; Exception: The functional tests require DConf to be the default
-- 
2.45.1

[bug#71599] [PATCH gnome-team 2/2] gnu: tracker-miners: Update to 3.7.3.

[Maxim Cournoyer]

Hi Liliana,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> * gnu/packages/gnome.scm (tracker-miners): Update to 3.7.3.
> [#:configure-flags]: Add “-Dlandlock=disabled”.
> ---
>  gnu/packages/gnome.scm | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index d7a8f12550..ce20262d2d 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -9766,7 +9766,7 @@ (define-public tracker
>  (define-public tracker-miners
>    (package
>      (name "tracker-miners")
> -    (version "3.6.1")
> +    (version "3.7.3")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnome/sources/tracker-miners/"
> @@ -9774,7 +9774,7 @@ (define-public tracker-miners
>                                    "/tracker-miners-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "13ljx0birrav728ik3bnlwzgas8q6rbhjbvxp7zzwy6ambafiw7f"))))
> +                "1zm57pih7csgipw3w2b1sgadvfszik70sbz4gr5pn6aw9caqhhz7"))))
>      (build-system meson-build-system)
>      (arguments
>       `(#:glib-or-gtk? #t
> @@ -9784,6 +9784,10 @@ (define-public tracker-miners
>               (string-append "-Dc_link_args=-Wl,-rpath="
>                              (assoc-ref %outputs "out")
>                              "/lib/tracker-miners-3.0")
> +             ;; TODO: Check if this is only a build-time failure,
> +             ;; or add variants to explicitly enable this features, see also
> +             ;; <https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/300>.

Purely cosmetic and inconsequential, but Ludovic once taught me to use
something like:

--8<---------------cut here---------------start------------->8---
;; TODO: Check if this is only a build-time failure, or add variants to
;; explicitly enable this features (see:
;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/300).
--8<---------------cut here---------------end--------------->8---

which I find elegant.

-- 
Thanks,
Maxim

[bug#71599] [PATCH gnome-team 2/2] gnu: tracker-miners: Update to 3.7.3.

[Liliana Marie Prikler]

Am Montag, dem 17.06.2024 um 15:58 -0400 schrieb Maxim Cournoyer:
> Hi Liliana,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > * gnu/packages/gnome.scm (tracker-miners): Update to 3.7.3.
> > [#:configure-flags]: Add “-Dlandlock=disabled”.
> > ---
> >  gnu/packages/gnome.scm | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> > index d7a8f12550..ce20262d2d 100644
> > --- a/gnu/packages/gnome.scm
> > +++ b/gnu/packages/gnome.scm
> > @@ -9766,7 +9766,7 @@ (define-public tracker
> >  (define-public tracker-miners
> >    (package
> >      (name "tracker-miners")
> > -    (version "3.6.1")
> > +    (version "3.7.3")
> >      (source (origin
> >                (method url-fetch)
> >                (uri (string-append "mirror://gnome/sources/tracker-
> > miners/"
> > @@ -9774,7 +9774,7 @@ (define-public tracker-miners
> >                                    "/tracker-miners-" version
> > ".tar.xz"))
> >                (sha256
> >                 (base32
> > -               
> > "13ljx0birrav728ik3bnlwzgas8q6rbhjbvxp7zzwy6ambafiw7f"))))
> > +               
> > "1zm57pih7csgipw3w2b1sgadvfszik70sbz4gr5pn6aw9caqhhz7"))))
> >      (build-system meson-build-system)
> >      (arguments
> >       `(#:glib-or-gtk? #t
> > @@ -9784,6 +9784,10 @@ (define-public tracker-miners
> >               (string-append "-Dc_link_args=-Wl,-rpath="
> >                              (assoc-ref %outputs "out")
> >                              "/lib/tracker-miners-3.0")
> > +             ;; TODO: Check if this is only a build-time failure,
> > +             ;; or add variants to explicitly enable this
> > features, see also
> > +             ;;
> > <https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/300>.
> 
> Purely cosmetic and inconsequential, but Ludovic once taught me to
> use something like:
> 
> --8<---------------cut here---------------start------------->8---
> ;; TODO: Check if this is only a build-time failure, or add variants
> to
> ;; explicitly enable this features (see:
> ;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/300).
> --8<---------------cut here---------------end--------------->8---
> 
> which I find elegant.
In other words, I should not use <> for URIs, but instead use brackets
for the whole see expression?

[bug#71599] [PATCH gnome-team 2/2] gnu: tracker-miners: Update to 3.7.3.

[Maxim Cournoyer]

Hi Liliana,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Montag, dem 17.06.2024 um 15:58 -0400 schrieb Maxim Cournoyer:
>> Hi Liliana,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > * gnu/packages/gnome.scm (tracker-miners): Update to 3.7.3.
>> > [#:configure-flags]: Add “-Dlandlock=disabled”.
>> > ---
>> >  gnu/packages/gnome.scm | 8 ++++++--
>> >  1 file changed, 6 insertions(+), 2 deletions(-)
>> > 
>> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
>> > index d7a8f12550..ce20262d2d 100644
>> > --- a/gnu/packages/gnome.scm
>> > +++ b/gnu/packages/gnome.scm
>> > @@ -9766,7 +9766,7 @@ (define-public tracker
>> >  (define-public tracker-miners
>> >    (package
>> >      (name "tracker-miners")
>> > -    (version "3.6.1")
>> > +    (version "3.7.3")
>> >      (source (origin
>> >                (method url-fetch)
>> >                (uri (string-append "mirror://gnome/sources/tracker-
>> > miners/"
>> > @@ -9774,7 +9774,7 @@ (define-public tracker-miners
>> >                                    "/tracker-miners-" version
>> > ".tar.xz"))
>> >                (sha256
>> >                 (base32
>> > -               
>> > "13ljx0birrav728ik3bnlwzgas8q6rbhjbvxp7zzwy6ambafiw7f"))))
>> > +               
>> > "1zm57pih7csgipw3w2b1sgadvfszik70sbz4gr5pn6aw9caqhhz7"))))
>> >      (build-system meson-build-system)
>> >      (arguments
>> >       `(#:glib-or-gtk? #t
>> > @@ -9784,6 +9784,10 @@ (define-public tracker-miners
>> >               (string-append "-Dc_link_args=-Wl,-rpath="
>> >                              (assoc-ref %outputs "out")
>> >                              "/lib/tracker-miners-3.0")
>> > +             ;; TODO: Check if this is only a build-time failure,
>> > +             ;; or add variants to explicitly enable this
>> > features, see also
>> > +             ;;
>> > <https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/300>.
>> 
>> Purely cosmetic and inconsequential, but Ludovic once taught me to
>> use something like:
>> 
>> --8<---------------cut here---------------start------------->8---
>> ;; TODO: Check if this is only a build-time failure, or add variants
>> to
>> ;; explicitly enable this features (see:
>> ;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/300).
>> --8<---------------cut here---------------end--------------->8---
>> 
>> which I find elegant.
> In other words, I should not use <> for URIs, but instead use brackets
> for the whole see expression?

The recipe of that scheme is (see: $url) -- the parentheses are
important.

But otherwise, it's just a convention I've seen used often in the code
base (because Ludovic and probably others like me use it as well).

-- 
Thanks,
Maxim

[bug#71599] [PATCH gnome-team 2/2] gnu: tracker-miners: Update to 3.7.3.

[Liliana Marie Prikler]

Hi Maxim,

Am Montag, dem 17.06.2024 um 19:47 -0400 schrieb Maxim Cournoyer:
> The recipe of that scheme is (see: $url) -- the parentheses are
> important.
> 
> But otherwise, it's just a convention I've seen used often in the
> code base (because Ludovic and probably others like me use it as
> well).
Welp, thanks for the clarification, I've pushed it with the proposed
scheme.

[bug#71599] [PATCH gnome-team 0/2] Update Tracker

[Maxim Cournoyer]

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Hi Guix,
>
> this series updates tracker and tracker-miners (soon to be TinySPARQL and
> localsearch) to their most recent versions.  From what I can see, this could
> possibly also go to master, but it does influence at least one webkit, so
> I'd rather not cause a rebuild.
>
> Cheers
>
> Liliana Marie Prikler (2):
>   gnu: tracker: Update to 3.7.3.
>   gnu: tracker-miners: Update to 3.7.3.
>

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim