all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: 48459@debbugs.gnu.org
Cc: Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#48459] [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	[thread overview]
Message-ID: <20210518030514.6206-5-rg@raghavgururajan.name> (raw)
In-Reply-To: <20210518030514.6206-1-rg@raghavgururajan.name>

* 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





  parent reply	other threads:[~2021-05-18  3:06 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-16  5:04 [bug#48459] [PATCH-SERIES]: GNOME Tracker Raghav Gururajan via Guix-patches via
2021-05-16  5:07 ` [bug#48459] [PATCH 1/3] gnu: tracker: Add missing dependencies Raghav Gururajan via Guix-patches via
2021-05-16  5:07   ` [bug#48459] [PATCH 2/3] gnu: tracker: Enable documentation Raghav Gururajan via Guix-patches via
2021-05-16  5:07   ` [bug#48459] [PATCH 3/3] gnu: tracker: Update to 3.1.1 Raghav Gururajan via Guix-patches via
2021-05-16  7:36   ` [bug#48459] [PATCH 1/3] gnu: tracker: Add missing dependencies Christopher Baines
2021-05-18  3:14     ` Raghav Gururajan via Guix-patches via
2021-05-16  7:13 ` [bug#48459] [PATCH-SERIES]: GNOME Tracker Leo Prikler
2021-05-18  3:11   ` Raghav Gururajan via Guix-patches via
2021-05-18  3:05 ` [bug#48459] [PATCH wip-gnome v2 1/6] gnu: tracker: Enable some features Raghav Gururajan via Guix-patches via
2021-05-18  3:05   ` [bug#48459] [PATCH wip-gnome v2 2/6] gnu: tracker: Enable documentation Raghav Gururajan via Guix-patches via
2021-05-18  3:05   ` [bug#48459] [PATCH wip-gnome v2 3/6] gnu: tracker: Update to 3.1.1 and make related changes Raghav Gururajan via Guix-patches via
2021-05-18  3:05   ` [bug#48459] [PATCH wip-gnome v2 4/6] gnu: tracker: Propagate dependencies as per pkg-config file Raghav Gururajan via Guix-patches via
2021-05-18  3:05   ` Raghav Gururajan via Guix-patches via [this message]
2021-05-18  3:05   ` [bug#48459] [PATCH wip-gnome v2 6/6] gnu: tracker-miners: Enable some features Raghav Gururajan via Guix-patches via
2021-05-21 21:33 ` bug#48459: (no subject) Raghav Gururajan via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210518030514.6206-5-rg@raghavgururajan.name \
    --to=guix-patches@gnu.org \
    --cc=48459@debbugs.gnu.org \
    --cc=rg@raghavgururajan.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.