From patchwork Sat Feb 25 06:51:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 47295 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 D7CB016B4C; Sat, 25 Feb 2023 08:54:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7DE371685E for ; Sat, 25 Feb 2023 08:54:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVqJl-0006bO-8E; Sat, 25 Feb 2023 03:54:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVqJf-0006as-9G for guix-patches@gnu.org; Sat, 25 Feb 2023 03:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVqJf-0000y6-0n for guix-patches@gnu.org; Sat, 25 Feb 2023 03:54:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVqJe-0005QL-NE for guix-patches@gnu.org; Sat, 25 Feb 2023 03:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61780] [PATCH 2/3] gnu: tracker: Use G-Expressions in arguments. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 08:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61780@debbugs.gnu.org Received: via spool by 61780-submit@debbugs.gnu.org id=B61780.167731520920795 (code B ref 61780); Sat, 25 Feb 2023 08:54:02 +0000 Received: (at 61780) by debbugs.gnu.org; 25 Feb 2023 08:53:29 +0000 Received: from localhost ([127.0.0.1]:39005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVqJ6-0005PJ-Hp for submit@debbugs.gnu.org; Sat, 25 Feb 2023 03:53:28 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:33774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVqJ1-0005Oj-7A for 61780@debbugs.gnu.org; Sat, 25 Feb 2023 03:53:23 -0500 Received: by mail-ed1-f65.google.com with SMTP id ck15so6692671edb.0 for <61780@debbugs.gnu.org>; Sat, 25 Feb 2023 00:53:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=m13Pvj1YRF+fQvLV1je/hJQDLFkYgtIE2LZo6qYUDiI=; b=hwSuZy2xunIw61mYh9X5bdK1io/v85RRtv3Y0y+JPkpOZ6rJeCWLDsRq/YbZZKbhyA dehnBpfPE2Plo1O0lqScSgyI3CR/JVuZx9E6fc+3ccnrGkmNbMtz5jLBfz8FysICdA5E 6iQNwUmzl2wuLmVcbd5LeLP6hTuO8NoKydxUGl8RAsjOJBoige82drhOugufOqPpKD4I XWjFSntJUen3Lpk5LpI56qvO0tTaJ2m0ESGw02knr+V4PNdUYwaBIBfk180MR9iqfCzp GH4CTwAWvOFpkJFLcNXRwxvkOuc8rmN8gIsFIrTw7N1mEJ7Ryv8zaKCfLYhu9LxB+xYY wU5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=m13Pvj1YRF+fQvLV1je/hJQDLFkYgtIE2LZo6qYUDiI=; b=nXWINYTEsdBW3zuqDw61OtQsHsIXzpEFKFR8/HtSqsDVFu7lOttm23jbZ5L8GyWJ/B 7OAjqGf0kB53zN3guFNkXxUzHgPq0OK00DUuTdHMIxGmVzRWG5gCYvg4/oiXCJ3WclJT 6l7I0cJECW0A06xp3nIJwCO1A8RAOCBWyo8qx1itx4ZTg5so7gl+c296eZ0w8OfB8IYF piynbh+ZNzSol735UvtafrZGv3v8Ne+OP4xlLov+3pQVJODbUAdX0wMe1QdnMJ4+lF7f UzsOoSTVdk0oeXrq3BFtIQBsupZQ5ODeVzp7M04J2IvSIUH3GKyPgciTLGVBb4BZvWqZ m0rg== X-Gm-Message-State: AO0yUKVqt6zJeechL0GTK6y+7NS7G7prUqKXjOw9URCsBHuTf/yvS1lm RM9tqhEI6XAbpoO/Ce2wovIRDGbomyhWsg== X-Google-Smtp-Source: AK7set+G/1Y0hkBqpcwgi/VkmIYcbBKtS77w0m5RLEZDIktcPNkBA1JTnZTYm7YkArRWUJUF0dmSdw== X-Received: by 2002:a05:6402:1a32:b0:4a0:e31a:434 with SMTP id be18-20020a0564021a3200b004a0e31a0434mr17688488edb.27.1677315197206; Sat, 25 Feb 2023 00:53:17 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id y23-20020a50ce17000000b004af6163f845sm603457edi.28.2023.02.25.00.53.16 for <61780@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 00:53:16 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 25 Feb 2023 07:51:45 +0100 Message-ID: <5c42a7fa50e76841f13680c3879226dd4b50c1ad.camel@gmail.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (tracker)[arguments]: Change to list of G-Expressions. Re-indent. --- gnu/packages/gnome.scm | 93 +++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd9b80ea67..00d4190727 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9673,52 +9673,53 @@ (define-public tracker "0r144kdqxdzs51qn495vablzf1zxkhkk6imrlrzj9wiqwc2gg520")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:test-options (list ,@(if (target-riscv64?) - `("--timeout-multiplier" "5") - '())) - #: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-3.0") - "-Ddocs=false" - "-Dsystemd_user_services=false") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "utils/trackertestutils/__main__.py" - (("/bin/bash") - (search-input-file inputs "bin/bash"))))) - (add-before 'configure 'set-shell - (lambda _ - (setenv "SHELL" (which "bash")))) - (add-before 'configure 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let* ((manpage "/etc/asciidoc/docbook-xsl/manpage.xsl") - (file (search-input-file inputs manpage))) - (substitute* "docs/manpages/meson.build" - (("/etc/asciidoc[^']+") - file))))) - (replace 'check - (lambda* (#:key tests? test-options #:allow-other-keys) - (when tests? - ;; Some tests expect to write to $HOME. - (setenv "HOME" "/tmp") - (apply invoke "dbus-run-session" "--" "meson" "test" - "--print-errorlogs" test-options)))) - (add-after 'glib-or-gtk-wrap 'unwrap-libexec - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion (string-append (assoc-ref outputs "out") - "/libexec/tracker3") - (for-each - (lambda (f) - (let ((real (string-append "." (basename f) "-real"))) - (when (file-exists? real) - (delete-file f) - (rename-file real f)))) - (find-files ".")))))))) + (list + #:glib-or-gtk? #t + #:test-options `(list ,@(if (target-riscv64?) + `("--timeout-multiplier" "5") + '())) + #:configure-flags + ;; Otherwise, the RUNPATH will lack the final path component. + #~(list (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib:" + #$output "/lib/tracker-3.0") + "-Ddocs=false" + "-Dsystemd_user_services=false") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "utils/trackertestutils/__main__.py" + (("/bin/bash") + (search-input-file inputs "bin/bash"))))) + (add-before 'configure 'set-shell + (lambda _ + (setenv "SHELL" (which "bash")))) + (add-before 'configure 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((manpage "/etc/asciidoc/docbook-xsl/manpage.xsl") + (file (search-input-file inputs manpage))) + (substitute* "docs/manpages/meson.build" + (("/etc/asciidoc[^']+") + file))))) + (replace 'check + (lambda* (#:key tests? test-options #:allow-other-keys) + (when tests? + ;; Some tests expect to write to $HOME. + (setenv "HOME" "/tmp") + (apply invoke "dbus-run-session" "--" "meson" "test" + "--print-errorlogs" test-options)))) + (add-after 'glib-or-gtk-wrap 'unwrap-libexec + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (string-append (assoc-ref outputs "out") + "/libexec/tracker3") + (for-each + (lambda (f) + (let ((real (string-append "." (basename f) "-real"))) + (when (file-exists? real) + (delete-file f) + (rename-file real f)))) + (find-files ".")))))))) (native-inputs (list gettext-minimal `(,glib "bin")