GNU bug report logs - #48459
[PATCH-SERIES]: GNOME Tracker

Previous Next

Package: guix-patches;

Reported by: Raghav Gururajan <rg <at> raghavgururajan.name>

Date: Sun, 16 May 2021 05:06:02 UTC

Severity: normal

Tags: patch

Done: Raghav Gururajan <rg <at> raghavgururajan.name>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48459 in the body.
You can then email your comments to 48459 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Sun, 16 May 2021 05:06:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Raghav Gururajan <rg <at> raghavgururajan.name>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 16 May 2021 05:06:02 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: guix-patches <at> gnu.org
Cc: Leo Prikler <leo.prikler <at> student.tugraz.at>
Subject: [PATCH-SERIES]: GNOME Tracker
Date: Sun, 16 May 2021 01:04:41 -0400
[Message part 1 (text/plain, inline)]

[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Sun, 16 May 2021 05:09:02 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH 2/3] gnu: tracker: Enable documentation.
Date: Sun, 16 May 2021 01:07:58 -0400
* gnu/packages/gnome.scm (tracker)[outputs](doc): New output.
[configure-flags](docs): New flag.
[phases](patch-docbook-xml,move-doc): New phases.
[native-inputs]: Add docbook-xml, docbook-xsl and gtk-doc.
---
 gnu/packages/gnome.scm | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 882b643067..e8be1effc5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8734,23 +8734,52 @@ easy, safe, and automatic.")
                (base32
                 "1ixxyqjlv7pnl4j8g6b72fkbjvzfspza8y71ppkncry8i6xkr223"))))
     (build-system meson-build-system)
+    (outputs '("out" "doc"))
     (arguments
      `(#:glib-or-gtk? #t
        #:configure-flags
-       ;; Otherwise, the RUNPATH will lack the final path component.
-       (list (string-append "-Dc_link_args=-Wl,-rpath="
-                            (assoc-ref %outputs "out") "/lib:"
-                            (assoc-ref %outputs "out") "/lib/tracker-2.0"))
+       (list
+        "-Ddocs=true"
+        ;; Otherwise, the RUNPATH will lack the final path component.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out") "/lib:"
+                       (assoc-ref %outputs "out") "/lib/tracker-2.0"))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs/reference"
+               (substitute* (find-files "." "\\..*ml$")
+                 (("http://www.oasis-open.org/docbook/xml/4.5/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.5")
+                                 "/xml/dtd/docbook/"))
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.3")
+                                 "/xml/dtd/docbook/"))
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.1.2")
+                                 "/xml/dtd/docbook/"))))))
          (add-before 'check 'pre-check
            (lambda _
              ;; Some tests expect to write to $HOME.
              (setenv "HOME" "/tmp")
-             #t)))))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")
+     `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+       ("docbook-xml-4.3" ,docbook-xml-4.3)
+       ("docbook-xml-4.5" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
        ("python-pygobject" ,python-pygobject)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Sun, 16 May 2021 05:09:02 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH 1/3] gnu: tracker: Add missing dependencies.
Date: Sun, 16 May 2021 01:07:57 -0400
* gnu/packages/gnome.scm (tracker)[native-inputs]: Add python-wrapper.
[inputs]: Add bash-completion, network-manager and libstemmer.
[propagated-inputs]: Add glib.
---
 gnu/packages/gnome.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index be458c07bb..882b643067 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -133,6 +133,7 @@
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages kerberos)
+  #:use-module (gnu packages language)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunistring)
@@ -8753,14 +8754,20 @@ easy, safe, and automatic.")
        ("python-pygobject" ,python-pygobject)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)       ; she-bangs
        ("vala" ,vala)))
     (inputs
-     `(("dbus" ,dbus)
+     `(("bash-completion" ,bash-completion) ; bash-completions
+       ("dbus" ,dbus)
        ("sqlite" ,sqlite)
        ("libxml2" ,libxml2)
-       ("icu4c" ,icu4c)                 ; libunistring gets miner-miner-fs test to fail.
+       ("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
        ("json-glib" ,json-glib)
-       ("libsoup" ,libsoup)))
+       ("libnm" ,network-manager)       ; network status detection
+       ("libsoup" ,libsoup)
+       ("stemmer" ,libstemmer)))        ; stemming
+    (propagated-inputs
+     `(("glib" ,glib)))                 ; referenced in .pc files
     (synopsis "Metadata database, indexer and search tool")
     (home-page "https://wiki.gnome.org/Projects/Tracker")
     (description
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Sun, 16 May 2021 05:09:02 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH 3/3] gnu: tracker: Update to 3.1.1.
Date: Sun, 16 May 2021 01:07:59 -0400
* gnu/packages/gnome.scm (tracker)[configure-flags]
(systemd_user_services,test_utils): New flags.
(docs,c_link_args): Remove flags.
[phases](adjust-tests,patch-docs): New phases.
(patch-docbook-xml,pre-check): Remove phases.
(check): Replace with custom phase.
[native-inputs]: Add asciidoc and libxslt.
---
 gnu/packages/gnome.scm | 62 ++++++++++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e8be1effc5..4cc6d2a13d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8724,7 +8724,7 @@ easy, safe, and automatic.")
 (define-public tracker
   (package
     (name "tracker")
-    (version "2.3.5")
+    (version "3.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker/"
@@ -8732,22 +8732,47 @@ easy, safe, and automatic.")
                                   "tracker-" version ".tar.xz"))
               (sha256
                (base32
-                "1ixxyqjlv7pnl4j8g6b72fkbjvzfspza8y71ppkncry8i6xkr223"))))
+                "1rwafk58dm8fpfdb3yk77g0f9gxkk5dy8hm2yx26y1jlhkly4xj3"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
      `(#:glib-or-gtk? #t
        #:configure-flags
        (list
-        "-Ddocs=true"
-        ;; Otherwise, the RUNPATH will lack the final path component.
-        (string-append "-Dc_link_args=-Wl,-rpath="
-                       (assoc-ref %outputs "out") "/lib:"
-                       (assoc-ref %outputs "out") "/lib/tracker-2.0"))
+        "-Dsystemd_user_services=false" ; not applicable
+        "-Dtest_utils=false")           ; disable installed tests
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-docbook-xml
+         (add-after 'unpack 'adjust-tests
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Use correct shell path.
+             (substitute* "utils/trackertestutils/__main__.py"
+               (("shell =.*$")
+                (string-append "shell = '"
+                               (assoc-ref inputs "bash")
+                               "/bin/bash'")))
+             ;; These tests require python-tappy,
+             ;; which is not available.
+             (with-directory-excursion "tests"
+               (substitute* "libtracker-data/meson.build"
+                 (("[ \t]*'sparql'") ""))
+               (substitute* "meson.build"
+                 (("subdir\\('functional-tests'\\)") "")))))
+         (add-after 'unpack 'patch-docs
            (lambda* (#:key inputs #:allow-other-keys)
+             ;; Don't rename documentation directories,
+             ;; during installation.
+             (with-directory-excursion "docs/reference"
+               (substitute* (find-files "." "meson.build")
+                 (("[ \t]*module_version: tracker_api_major,")
+                  "")))
+             ;; Fix asciidoc references.
+             (with-directory-excursion "docs/manpages"
+               (substitute* "meson.build"
+                 (("/etc/asciidoc/docbook-xsl/")
+                  (string-append (assoc-ref inputs "asciidoc")
+                                 "/etc/asciidoc/docbook-xsl/"))))
+             ;; Fix docbook references.
              (with-directory-excursion "docs/reference"
                (substitute* (find-files "." "\\..*ml$")
                  (("http://www.oasis-open.org/docbook/xml/4.5/")
@@ -8759,11 +8784,16 @@ easy, safe, and automatic.")
                  (("http://www.oasis-open.org/docbook/xml/4.1.2/")
                   (string-append (assoc-ref inputs "docbook-xml-4.1.2")
                                  "/xml/dtd/docbook/"))))))
-         (add-before 'check 'pre-check
-           (lambda _
-             ;; Some tests expect to write to $HOME.
-             (setenv "HOME" "/tmp")
-             #t))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               ;; Tests write to $HOME.
+               (setenv "HOME" (getcwd))
+               ;; Tests look for $XDG_RUNTIME_DIR.
+               (setenv "XDG_RUNTIME_DIR" (getcwd))
+               ;; For missing '/etc/machine-id'.
+               (setenv "DBUS_FATAL_WARNINGS" "0")
+               (invoke "dbus-launch" "ninja" "test"))))
          (add-after 'install 'move-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -8773,7 +8803,8 @@ easy, safe, and automatic.")
                 (string-append out "/share/gtk-doc")
                 (string-append doc "/share/gtk-doc"))))))))
     (native-inputs
-     `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+     `(("asciidoc" ,asciidoc)
+       ("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
        ("docbook-xml-4.3" ,docbook-xml-4.3)
        ("docbook-xml-4.5" ,docbook-xml)
        ("docbook-xsl" ,docbook-xsl)
@@ -8784,7 +8815,8 @@ easy, safe, and automatic.")
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)       ; she-bangs
-       ("vala" ,vala)))
+       ("vala" ,vala)
+       ("xsltproc" ,libxslt)))
     (inputs
      `(("bash-completion" ,bash-completion) ; bash-completions
        ("dbus" ,dbus)
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Sun, 16 May 2021 07:14:02 GMT) Full text and rfc822 format available.

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

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: Raghav Gururajan <rg <at> raghavgururajan.name>, 48459 <at> debbugs.gnu.org
Subject: Re: [PATCH-SERIES]: GNOME Tracker
Date: Sun, 16 May 2021 09:13:52 +0200
Am Sonntag, den 16.05.2021, 01:04 -0400 schrieb Raghav Gururajan:
> +        "-Dtest_utils=false")           ; disable installed tests
Why?

> +             ;; These tests require python-tappy,
> +             ;; which is not available.
Perhaps it's only tangentially related, but how difficult would it be
to package?

Tracker has 15 dependants.  Does this update require anything from wip-
gnome/core-updates?  Would these build and run fine on master?

Regards,
Leo





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Sun, 16 May 2021 07:37:01 GMT) Full text and rfc822 format available.

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

From: Christopher Baines <mail <at> cbaines.net>
To: Raghav Gururajan <rg <at> raghavgururajan.name>
Cc: 48459 <at> debbugs.gnu.org
Subject: Re: [bug#48459] [PATCH 1/3] gnu: tracker: Add missing dependencies.
Date: Sun, 16 May 2021 08:36:45 +0100
[Message part 1 (text/plain, inline)]
Raghav Gururajan via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/gnome.scm (tracker)[native-inputs]: Add python-wrapper.
> [inputs]: Add bash-completion, network-manager and libstemmer.
> [propagated-inputs]: Add glib.

Missing in my mind implies something was broken because of the missing
dependencies, and if that's the case, it would be good to note what
adding these missing dependencies fixes.

If these are just additional dependencies, it would also be good to note
what the addition of these dependencies enables.

> ---
>  gnu/packages/gnome.scm | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index be458c07bb..882b643067 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -133,6 +133,7 @@
>    #:use-module (gnu packages inkscape)
>    #:use-module (gnu packages iso-codes)
>    #:use-module (gnu packages kerberos)
> +  #:use-module (gnu packages language)
>    #:use-module (gnu packages libcanberra)
>    #:use-module (gnu packages libffi)
>    #:use-module (gnu packages libunistring)
> @@ -8753,14 +8754,20 @@ easy, safe, and automatic.")
>         ("python-pygobject" ,python-pygobject)
>         ("intltool" ,intltool)
>         ("pkg-config" ,pkg-config)
> +       ("python" ,python-wrapper)       ; she-bangs

shebang is one (very odd word):
 https://en.wikipedia.org/wiki/Shebang_(Unix)

That doesn't help me to understand what this (native?) input is being
added for though?

>         ("vala" ,vala)))
>      (inputs
> -     `(("dbus" ,dbus)
> +     `(("bash-completion" ,bash-completion) ; bash-completions

I'm not sure what the comment adds here?

> +       ("dbus" ,dbus)
>         ("sqlite" ,sqlite)
>         ("libxml2" ,libxml2)
> -       ("icu4c" ,icu4c)                 ; libunistring gets miner-miner-fs test to fail.
> +       ("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
>         ("json-glib" ,json-glib)
> -       ("libsoup" ,libsoup)))
> +       ("libnm" ,network-manager)       ; network status detection

This comment is useful.

> +       ("libsoup" ,libsoup)
> +       ("stemmer" ,libstemmer)))        ; stemming

I don't think this comment adds anything.

> +    (propagated-inputs
> +     `(("glib" ,glib)))                 ; referenced in .pc files

This one does though.

>      (synopsis "Metadata database, indexer and search tool")
>      (home-page "https://wiki.gnome.org/Projects/Tracker")
>      (description

[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:06:01 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH wip-gnome v2 2/6] gnu: tracker: Enable documentation.
Date: Mon, 17 May 2021 23:05:10 -0400
* gnu/packages/gnome.scm (tracker)[outputs](doc): New output.
[configure-flags](docs): New flag.
[phases](patch-docbook-xml,move-doc): New phases.
[native-inputs]: Add docbook-xml, docbook-xsl and gtk-doc.
---
 gnu/packages/gnome.scm | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 22182c407c..c81d6246b8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8783,23 +8783,52 @@ easy, safe, and automatic.")
                (base32
                 "1ixxyqjlv7pnl4j8g6b72fkbjvzfspza8y71ppkncry8i6xkr223"))))
     (build-system meson-build-system)
+    (outputs '("out" "doc"))
     (arguments
      `(#:glib-or-gtk? #t
        #:configure-flags
-       ;; Otherwise, the RUNPATH will lack the final path component.
-       (list (string-append "-Dc_link_args=-Wl,-rpath="
-                            (assoc-ref %outputs "out") "/lib:"
-                            (assoc-ref %outputs "out") "/lib/tracker-2.0"))
+       (list
+        "-Ddocs=true"
+        ;; Otherwise, the RUNPATH will lack the final path component.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out") "/lib:"
+                       (assoc-ref %outputs "out") "/lib/tracker-2.0"))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs/reference"
+               (substitute* (find-files "." "\\..*ml$")
+                 (("http://www.oasis-open.org/docbook/xml/4.5/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.5")
+                                 "/xml/dtd/docbook/"))
+                 (("http://www.oasis-open.org/docbook/xml/4.3/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.3")
+                                 "/xml/dtd/docbook/"))
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.1.2")
+                                 "/xml/dtd/docbook/"))))))
          (add-before 'check 'pre-check
            (lambda _
              ;; Some tests expect to write to $HOME.
              (setenv "HOME" "/tmp")
-             #t)))))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")
+     `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+       ("docbook-xml-4.3" ,docbook-xml-4.3)
+       ("docbook-xml-4.5" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
        ("python-pygobject" ,python-pygobject)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:06:02 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH wip-gnome v2 3/6] gnu: tracker: Update to 3.1.1 and make
 related changes.
Date: Mon, 17 May 2021 23:05:11 -0400
* gnu/packages/gnome.scm (tracker)[configure-flags]
(systemd_user_services): New flag.
(docs,c_link_args): Remove flags.
[phases](adjust-tests,patch-docs): New phases.
(patch-docbook-xml,pre-check): Remove phases.
(check): Replace with custom phase.
[native-inputs]: Add asciidoc, libxslt and python-tappy.
---
 gnu/packages/gnome.scm | 63 ++++++++++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c81d6246b8..382a95aaa4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -169,6 +169,7 @@
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
@@ -8773,7 +8774,7 @@ easy, safe, and automatic.")
 (define-public tracker
   (package
     (name "tracker")
-    (version "2.3.5")
+    (version "3.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker/"
@@ -8781,22 +8782,44 @@ easy, safe, and automatic.")
                                   "tracker-" version ".tar.xz"))
               (sha256
                (base32
-                "1ixxyqjlv7pnl4j8g6b72fkbjvzfspza8y71ppkncry8i6xkr223"))))
+                "1rwafk58dm8fpfdb3yk77g0f9gxkk5dy8hm2yx26y1jlhkly4xj3"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
      `(#:glib-or-gtk? #t
        #:configure-flags
        (list
-        "-Ddocs=true"
-        ;; Otherwise, the RUNPATH will lack the final path component.
-        (string-append "-Dc_link_args=-Wl,-rpath="
-                       (assoc-ref %outputs "out") "/lib:"
-                       (assoc-ref %outputs "out") "/lib/tracker-2.0"))
+        "-Dsystemd_user_services=false") ; not applicable
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-docbook-xml
+         (add-after 'unpack 'adjust-tests
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Use correct shell path.
+             (substitute* "utils/trackertestutils/__main__.py"
+               (("shell =.*$")
+                (string-append "shell = '"
+                               (assoc-ref inputs "bash")
+                               "/bin/bash'")))
+             ;; Due to syntax error bug.
+             ;; Refer, https://gitlab.gnome.org/GNOME/tracker/-/issues/307
+             (with-directory-excursion "tests"
+               (substitute* "libtracker-data/meson.build"
+                 (("[ \t]*'sparql'") "")))))
+         (add-after 'unpack 'patch-docs
            (lambda* (#:key inputs #:allow-other-keys)
+             ;; Don't rename documentation directories,
+             ;; during installation.
+             (with-directory-excursion "docs/reference"
+               (substitute* (find-files "." "meson.build")
+                 (("[ \t]*module_version: tracker_api_major,")
+                  "")))
+             ;; Fix asciidoc references.
+             (with-directory-excursion "docs/manpages"
+               (substitute* "meson.build"
+                 (("/etc/asciidoc/docbook-xsl/")
+                  (string-append (assoc-ref inputs "asciidoc")
+                                 "/etc/asciidoc/docbook-xsl/"))))
+             ;; Fix docbook references.
              (with-directory-excursion "docs/reference"
                (substitute* (find-files "." "\\..*ml$")
                  (("http://www.oasis-open.org/docbook/xml/4.5/")
@@ -8808,11 +8831,17 @@ easy, safe, and automatic.")
                  (("http://www.oasis-open.org/docbook/xml/4.1.2/")
                   (string-append (assoc-ref inputs "docbook-xml-4.1.2")
                                  "/xml/dtd/docbook/"))))))
-         (add-before 'check 'pre-check
-           (lambda _
-             ;; Some tests expect to write to $HOME.
-             (setenv "HOME" "/tmp")
-             #t))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               ;; Tests write to $HOME.
+               (setenv "HOME" (getcwd))
+               ;; Tests look for $XDG_RUNTIME_DIR.
+               (setenv "XDG_RUNTIME_DIR" (getcwd))
+               ;; For missing '/etc/machine-id'.
+               (setenv "DBUS_FATAL_WARNINGS" "0")
+               ;; Tests require d-bus session.
+               (invoke "dbus-launch" "ninja" "test"))))
          (add-after 'install 'move-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -8822,7 +8851,8 @@ easy, safe, and automatic.")
                 (string-append out "/share/gtk-doc")
                 (string-append doc "/share/gtk-doc"))))))))
     (native-inputs
-     `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+     `(("asciidoc" ,asciidoc)
+       ("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
        ("docbook-xml-4.3" ,docbook-xml-4.3)
        ("docbook-xml-4.5" ,docbook-xml)
        ("docbook-xsl" ,docbook-xsl)
@@ -8833,10 +8863,13 @@ easy, safe, and automatic.")
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)       ; for patch-shebangs phase
-       ("vala" ,vala)))
+       ("python-tappy" ,python-tappy)
+       ("vala" ,vala)
+       ("xsltproc" ,libxslt)))
     (inputs
      `(("bash-completion" ,bash-completion) ; for installing bash-completion files
        ("dbus" ,dbus)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("sqlite" ,sqlite)
        ("libxml2" ,libxml2)
        ("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:06:02 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH wip-gnome v2 4/6] gnu: tracker: Propagate dependencies as per
 pkg-config file.
Date: Mon, 17 May 2021 23:05:12 -0400
* gnu/packages/gnome.scm (tracker)[inputs]: Move json-glib, libsoup,
and libxml2 to ...
[propagated-inputs]: ... here.
---
 gnu/packages/gnome.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 382a95aaa4..5ca7181aea 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8871,14 +8871,15 @@ easy, safe, and automatic.")
        ("dbus" ,dbus)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("sqlite" ,sqlite)
-       ("libxml2" ,libxml2)
        ("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
-       ("json-glib" ,json-glib)
        ("libnm" ,network-manager) ; for network status detection support
-       ("libsoup" ,libsoup)
-       ("stemmer" ,libstemmer)))       ; for language stemming support
+       ("stemmer" ,libstemmer)))  ; for language stemming support
     (propagated-inputs
-     `(("glib" ,glib)))                 ; referenced in .pc files
+     ;; The following are referenced in pkg-config file.
+     `(("glib" ,glib)
+       ("json-glib" ,json-glib)
+       ("libsoup" ,libsoup)
+       ("libxml2" ,libxml2)))
     (synopsis "Metadata database, indexer and search tool")
     (home-page "https://wiki.gnome.org/Projects/Tracker")
     (description
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:06:03 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH wip-gnome v2 1/6] gnu: tracker: Enable some features.
Date: Mon, 17 May 2021 23:05:09 -0400
* gnu/packages/gnome.scm (tracker)[native-inputs]: Add python-wrapper.
[inputs]: Add bash-completion, network-manager and libstemmer.
[propagated-inputs]: Add glib.
---
 gnu/packages/gnome.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 58cee6cb3d..22182c407c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -133,6 +133,7 @@
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages kerberos)
+  #:use-module (gnu packages language)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunistring)
@@ -8802,14 +8803,20 @@ easy, safe, and automatic.")
        ("python-pygobject" ,python-pygobject)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)       ; for patch-shebangs phase
        ("vala" ,vala)))
     (inputs
-     `(("dbus" ,dbus)
+     `(("bash-completion" ,bash-completion) ; for installing bash-completion files
+       ("dbus" ,dbus)
        ("sqlite" ,sqlite)
        ("libxml2" ,libxml2)
-       ("icu4c" ,icu4c)                 ; libunistring gets miner-miner-fs test to fail.
+       ("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
        ("json-glib" ,json-glib)
-       ("libsoup" ,libsoup)))
+       ("libnm" ,network-manager) ; for network status detection support
+       ("libsoup" ,libsoup)
+       ("stemmer" ,libstemmer)))       ; for language stemming support
+    (propagated-inputs
+     `(("glib" ,glib)))                 ; referenced in .pc files
     (synopsis "Metadata database, indexer and search tool")
     (home-page "https://wiki.gnome.org/Projects/Tracker")
     (description
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:06:03 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH wip-gnome v2 5/6] gnu: tracker-miners: Update to 3.1.1 and
 make related changes.
Date: Mon, 17 May 2021 23:05:13 -0400
* gnu/packages/gnome.scm (tracker-miners)[version]: Update to 3.1.1.
[configure-flags](systemd_user_services): New flag.
(functional_tests): Remove flag.
(c_link_args): Modify.
[phases](disable-failing-tests,patch-docs): New phases.
(check): Replace with custom phase.
[native-inputs]: Add asciidoc, python-tappy and libxslt.
---
 gnu/packages/gnome.scm | 73 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5ca7181aea..9a026aad42 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8912,7 +8912,7 @@ endpoint and it understands SPARQL. ")
 (define-public tracker-miners
   (package
     (name "tracker-miners")
-    (version "2.3.4")
+    (version "3.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker-miners/"
@@ -8920,34 +8920,79 @@ endpoint and it understands SPARQL. ")
                                   "/tracker-miners-" version ".tar.xz"))
               (sha256
                (base32
-                "10wy8d8ski52k809p7s6lbw72qmg05bbmhnl00vx4qrbzqyxvc0b"))))
+                "1f5q0d45n9phcab65il7rn0wff85pyz5yh94lmi2hvqm3csn3lz4"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
        #:configure-flags
-       (list "-Dminer_rss=false" ; libgrss is required.
-             ;; Ensure the RUNPATH contains all installed library locations.
-             (string-append "-Dc_link_args=-Wl,-rpath="
-                            (assoc-ref %outputs "out")
-                            "/lib/tracker-miners-2.0")
-             ;; TODO: Enable functional tests. Currently, the following error
-             ;; appears:
-             ;; Exception: The functional tests require DConf to be the default
-             ;; GSettings backend. Got GKeyfileSettingsBackend instead.
-             "-Dfunctional_tests=false")))
+       (list
+        "-Dsystemd_user_services=false" ; not applicable
+        "-Dminer_rss=false"             ; libgrss is required.
+        ;; Ensure the RUNPATH contains all installed library locations.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out")
+                       "/lib/tracker-miners-3.0"))
+       #:phases
+       (modify-phases %standard-phases
+         ;; The following tests rely on filesystem monitoring,
+         ;; thus requiring $HOME to be not under /tmp prefix.
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/functional-tests/meson.build"
+               (("[ \t]*.*'audio/flac-musicbrainz'") "")
+               (("[ \t]*.*'audio/vorbis-musicbrainz'") "")
+               (("[ \t]*.*'disc-images/psx-game-image-1'") "")
+               (("[ \t]*'miner-basic',") "")
+               (("[ \t]*'miner-resource-removal',") "")
+               (("[ \t]*'fts-basic',") "")
+               (("[ \t]*'fts-file-operations',") "")
+               (("[ \t]*'extractor-decorator',") "")
+               (("[ \t]*'cli',") "")
+               (("[ \t]*.*'extractor-flac-cuesheet'") "")
+               (("[ \t]*'writeback-images',") "")
+               (("[ \t]*.*'writeback-audio'") ""))
+             (substitute* "tests/libtracker-miner/meson.build"
+               (("[ \t]*'file-notifier',") "")
+               (("[ \t]*'miner-fs',") ""))
+             (substitute* "examples/python/meson.build"
+               (("[ \t]*'query-async',") "")
+               (("[ \t]*'query-sync',") ""))))
+         (add-after 'unpack 'patch-docs
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Fix asciidoc references.
+             (with-directory-excursion "docs/manpages"
+               (substitute* "meson.build"
+                 (("/etc/asciidoc/docbook-xsl/")
+                  (string-append (assoc-ref inputs "asciidoc")
+                                 "/etc/asciidoc/docbook-xsl/"))))))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               ;; Tests write to $HOME.
+               (setenv "HOME" (getcwd))
+               ;; Tests look for $XDG_RUNTIME_DIR.
+               (setenv "XDG_RUNTIME_DIR" (getcwd))
+               ;; For missing '/etc/machine-id'.
+               (setenv "DBUS_FATAL_WARNINGS" "0")
+               ;; Tests require d-bus session.
+               (invoke "dbus-launch" "ninja" "test")))))))
     (native-inputs
-     `(("dbus" ,dbus)
+     `(("asciidoc" ,asciidoc)
+       ("dbus" ,dbus)
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("pkg-config" ,pkg-config)
-       ("python-pygobject" ,python-pygobject)))
+       ("python-pygobject" ,python-pygobject)
+       ("python-tappy" ,python-tappy)
+       ("xsltproc" ,libxslt)))
     (inputs
      `(("exempi" ,exempi)
        ("ffmpeg" ,ffmpeg)
        ("flac" ,flac)
        ("giflib" ,giflib)
        ("glib" ,glib)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gstreamer" ,gstreamer)
        ("icu4c" ,icu4c)
        ("libcue" ,libcue)
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:06:03 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [PATCH wip-gnome v2 6/6] gnu: tracker-miners: Enable some features.
Date: Mon, 17 May 2021 23:05:14 -0400
* gnu/packages/gnome.scm (tracker-miners)[configure-flags](miner_rss): Remove flag.
[native-inputs]: Move dbus to ...
[inputs]: ... here. Add gexiv2, gst-plugins-base, gupnp-dlna, libgrss,
network-manager and libraw.
---
 gnu/packages/gnome.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9a026aad42..271e421f43 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8927,7 +8927,6 @@ endpoint and it understands SPARQL. ")
        #:configure-flags
        (list
         "-Dsystemd_user_services=false" ; not applicable
-        "-Dminer_rss=false"             ; libgrss is required.
         ;; Ensure the RUNPATH contains all installed library locations.
         (string-append "-Dc_link_args=-Wl,-rpath="
                        (assoc-ref %outputs "out")
@@ -8978,7 +8977,6 @@ endpoint and it understands SPARQL. ")
                (invoke "dbus-launch" "ninja" "test")))))))
     (native-inputs
      `(("asciidoc" ,asciidoc)
-       ("dbus" ,dbus)
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
@@ -8987,22 +8985,29 @@ endpoint and it understands SPARQL. ")
        ("python-tappy" ,python-tappy)
        ("xsltproc" ,libxslt)))
     (inputs
-     `(("exempi" ,exempi)
+     `(("dbus" ,dbus)
+       ("exempi" ,exempi)
        ("ffmpeg" ,ffmpeg)
        ("flac" ,flac)
+       ("gexiv2" ,gexiv2)               ; for exiv2 support
        ("giflib" ,giflib)
        ("glib" ,glib)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base) ; for media-backend support
+       ("gupnp-dlna" ,gupnp-dlna)             ; for DLNA support
        ("icu4c" ,icu4c)
        ("libcue" ,libcue)
        ("libexif" ,libexif)
+       ("libgrss" ,libgrss)             ; for RSS data miner support
        ("libgsf" ,libgsf)
        ("libgxps" ,libgxps)
        ("libiptcdata" ,libiptcdata)
        ("libjpeg" ,libjpeg-turbo)
+       ("libnm" ,network-manager) ; for network status detection support
        ("libosinfo" ,libosinfo)
        ("libpng" ,libpng)
+       ("libraw" ,libraw)               ; for RAW format support
        ("libseccomp" ,libseccomp)
        ("libtiff" ,libtiff)
        ("libvorbis" ,libvorbis)
-- 
2.31.1





Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:12:01 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: Leo Prikler <leo.prikler <at> student.tugraz.at>, 48459 <at> debbugs.gnu.org
Subject: Re: [PATCH-SERIES]: GNOME Tracker
Date: Mon, 17 May 2021 23:11:45 -0400
[Message part 1 (text/plain, inline)]
Hi Leo,

> Why?

The flag was unnecessary, removed it in v2.

> Perhaps it's only tangentially related, but how difficult would it be
> to package?

Enabled those tests in v2.

> Tracker has 15 dependants.  Does this update require anything from wip-
> gnome/core-updates?  Would these build and run fine on master?

No, the dependents will fail as they also require updates. This 
patch-series is meant for wip-gnome. I added the branch name to subject 
in v2.

Thanks!

Regards,
RG.
[OpenPGP_0x5F5816647F8BE551.asc (application/pgp-keys, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#48459; Package guix-patches. (Tue, 18 May 2021 03:15:02 GMT) Full text and rfc822 format available.

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

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 48459 <at> debbugs.gnu.org
Subject: Re: [bug#48459] [PATCH 1/3] gnu: tracker: Add missing dependencies.
Date: Mon, 17 May 2021 23:14:41 -0400
[Message part 1 (text/plain, inline)]
Hi Christopher,

> Missing in my mind implies something was broken because of the missing
> dependencies, and if that's the case, it would be good to note what
> adding these missing dependencies fixes.
> 
> If these are just additional dependencies, it would also be good to note
> what the addition of these dependencies enables.
> 
> shebang is one (very odd word):
>   https://en.wikipedia.org/wiki/Shebang_(Unix)
> 
> That doesn't help me to understand what this (native?) input is being
> added for though?
> 
> I'm not sure what the comment adds here?
> 
> I don't think this comment adds anything.
I revised the patch in v2.

Thanks!

Regards,
RG.
[OpenPGP_0x5F5816647F8BE551.asc (application/pgp-keys, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

Reply sent to Raghav Gururajan <rg <at> raghavgururajan.name>:
You have taken responsibility. (Fri, 21 May 2021 21:34:02 GMT) Full text and rfc822 format available.

Notification sent to Raghav Gururajan <rg <at> raghavgururajan.name>:
bug acknowledged by developer. (Fri, 21 May 2021 21:34:02 GMT) Full text and rfc822 format available.

Message #49 received at 48459-done <at> debbugs.gnu.org (full text, mbox):

From: Raghav Gururajan <rg <at> raghavgururajan.name>
To: 48459-done <at> debbugs.gnu.org
Date: Fri, 21 May 2021 17:33:15 -0400
[Message part 1 (text/plain, inline)]
Pushed to wip-gnome. Closing ...
[OpenPGP_0x5F5816647F8BE551.asc (application/pgp-keys, attachment)]
[OpenPGP_signature (application/pgp-signature, attachment)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 19 Jun 2021 11:24:06 GMT) Full text and rfc822 format available.

This bug report was last modified 4 years ago.

Previous Next


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