From patchwork Tue May 18 03:05:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 29398 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 0FB7C27BC85; Tue, 18 May 2021 04:07:10 +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 6460127BC78 for ; Tue, 18 May 2021 04:07:09 +0100 (BST) Received: from localhost ([::1]:40810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liq4a-00038n-Kg for patchwork@mira.cbaines.net; Mon, 17 May 2021 23:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liq3X-0002Sy-RO for guix-patches@gnu.org; Mon, 17 May 2021 23:06:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1liq3X-0001u2-KU for guix-patches@gnu.org; Mon, 17 May 2021 23:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1liq3X-00040a-Fz for guix-patches@gnu.org; Mon, 17 May 2021 23:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48459] [PATCH wip-gnome v2 5/6] gnu: tracker-miners: Update to 3.1.1 and make related changes. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 May 2021 03:06:03 +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.162130714215346 (code B ref 48459); Tue, 18 May 2021 03:06:03 +0000 Received: (at 48459) by debbugs.gnu.org; 18 May 2021 03:05:42 +0000 Received: from localhost ([127.0.0.1]:54176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liq3B-0003zL-Si for submit@debbugs.gnu.org; Mon, 17 May 2021 23:05:42 -0400 Received: from out1.migadu.com ([91.121.223.63]:59782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liq39-0003yM-Dz for 48459@debbugs.gnu.org; Mon, 17 May 2021 23:05:40 -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=1621307139; 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=a7eoWbEAVEQw0WAs4qhZXTEKKkqGgPF67sGgdqoW5FY=; b=EnlIeVK58IvgN/oVHJOw9qFxlodGzM4NxKtY96Xb4YOIYmYcy4KiKhI/mqSL3IxatTQg9l /uRCtKvZJSp3OIcrdlrah9nvxfMJlEjZgxlzsJR3G9YOhxxhe0vZUiTsS61K3QMG4frMa+ KvReJh4v1U9YyLB42ReBMQsA2gnMqpWN1VMz1+JOSYhngo0Bqgv6PQRapI6+oZBB4dZBTo PD9IgSM4MVb+PyBwW0bZUNgXB1rYksJl2KhloZAhZZ77x31Rwnm7Xe8W6+end2FfjOQxm9 n+T3ywEs2PP+uYUhetu+aU53JihNHKJakjQgLLtE9vTWarzhGD+w52fLf8bveA== Date: Mon, 17 May 2021 23:05:13 -0400 Message-Id: <20210518030514.6206-5-rg@raghavgururajan.name> In-Reply-To: <20210518030514.6206-1-rg@raghavgururajan.name> References: <20210518030514.6206-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-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)