From patchwork Sun May 16 05:07:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 29335 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ECE4827BC78; Sun, 16 May 2021 06:09:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 012C827BC83 for ; Sun, 16 May 2021 06:09:24 +0100 (BST) Received: from localhost ([::1]:46960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1li91n-000870-2q for patchwork@mira.cbaines.net; Sun, 16 May 2021 01:09:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1li91T-00086R-Po for guix-patches@gnu.org; Sun, 16 May 2021 01:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1li91T-00012p-3d for guix-patches@gnu.org; Sun, 16 May 2021 01:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1li91S-0004tb-Va for guix-patches@gnu.org; Sun, 16 May 2021 01:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48459] [PATCH 3/3] gnu: tracker: Update to 3.1.1. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 May 2021 05:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48459@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 48459-submit@debbugs.gnu.org id=B48459.162114170318758 (code B ref 48459); Sun, 16 May 2021 05:09:02 +0000 Received: (at 48459) by debbugs.gnu.org; 16 May 2021 05:08:23 +0000 Received: from localhost ([127.0.0.1]:49547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1li90o-0004sP-QZ for submit@debbugs.gnu.org; Sun, 16 May 2021 01:08:23 -0400 Received: from out0.migadu.com ([94.23.1.103]:42716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1li90l-0004rx-BJ for 48459@debbugs.gnu.org; Sun, 16 May 2021 01:08:19 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1621141698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vEhbCwTzDEotdhtSr3qDQYyi8AH/lPGx1XmxMxvRIm8=; b=dMnC151qIh2xS2/WNoHHXR0meugie7keQtiUlw0sx1bVlawcqOf8yu9r+UF+jAzu8VngIC gqWAdODxUL9T2p1YX6r4odG01IB4XD9EsyTWPgAZVgURPy6Aid1ORWvSDXaq959G/UCOZn zA7M1mgcOFWFZPd6QH7hPusZlKQX8xoN4Ct9+PGZsckKTJRamOK6Z+MK0hMaZzYzzYlsKK snqBmmSdyPkQt9Pt/x+Aoh9YJZVN+jRWXbHL1Dds9HbLhsLGaoz2jqURsBL7Ewq+CDrump hwLd01BiXN7rZhOfGowk9rRog/25XD1FAHMB95sIRul07OerC23a5m39xFCInQ== Date: Sun, 16 May 2021 01:07:59 -0400 Message-Id: <20210516050759.7239-3-rg@raghavgururajan.name> In-Reply-To: <20210516050759.7239-1-rg@raghavgururajan.name> References: <20210516050759.7239-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * 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)