[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
121/125: gnu: tracker: Update to 3.1.1 and make related changes.
From: |
guix-commits |
Subject: |
121/125: gnu: tracker: Update to 3.1.1 and make related changes. |
Date: |
Sat, 3 Jul 2021 21:17:47 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit fb1285c17af5c39bf7e2dde8597aaf6550a17c95
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Sat May 15 23:59:41 2021 -0400
gnu: tracker: Update to 3.1.1 and make related changes.
* 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 cfdc2a1..a5bc32f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -171,6 +171,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)
@@ -8780,7 +8781,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/"
@@ -8788,22 +8789,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/")
@@ -8815,11 +8838,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"))
@@ -8829,7 +8858,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)
@@ -8840,10 +8870,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.
- 120/125: gnu: tracker: Enable documentation., (continued)
- 120/125: gnu: tracker: Enable documentation., guix-commits, 2021/07/03
- 94/125: gnu: gstreamer: Update to 1.18.4., guix-commits, 2021/07/03
- 71/125: gnu: json-glib: Update synopsis and description., guix-commits, 2021/07/03
- 75/125: gnu: wayland-protocols: Update description., guix-commits, 2021/07/03
- 77/125: gnu: gtk+-2: Enable tests., guix-commits, 2021/07/03
- 89/125: gnu: ibus: Enable tests., guix-commits, 2021/07/03
- 102/125: gnu: gst-editing-services: Update to 1.18.4., guix-commits, 2021/07/03
- 106/125: gnu: docbook-xsl: Update to 1.79.2., guix-commits, 2021/07/03
- 105/125: gnu: meson-0.55: Update to 0.55.3., guix-commits, 2021/07/03
- 116/125: gnu: gtkmm@2: Override inheritance of certain changes from gtkmm., guix-commits, 2021/07/03
- 121/125: gnu: tracker: Update to 3.1.1 and make related changes.,
guix-commits <=
- 82/125: gnu: gtk+: Enable cloud-providers support., guix-commits, 2021/07/03
- 84/125: gnu: gtkmm: Update to 3.24.4., guix-commits, 2021/07/03
- 90/125: gnu: ibus: Remove trailing #t in phases., guix-commits, 2021/07/03
- 91/125: gnu: iqa: Correct source uri., guix-commits, 2021/07/03
- 95/125: gnu: gst-plugins-base: Update to 1.18.4., guix-commits, 2021/07/03
- 99/125: gnu: gst-libav: Update to 1.18.4., guix-commits, 2021/07/03
- 74/125: gnu: wayland: Update synopsis, description and license., guix-commits, 2021/07/03
- 92/125: gnu: faac: Correct source uri., guix-commits, 2021/07/03
- 93/125: gnu: zbar: Update to 0.23.90., guix-commits, 2021/07/03
- 96/125: gnu: gst-plugins-base: Enable more features., guix-commits, 2021/07/03