From patchwork Thu Aug 24 04:16:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53172 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 CEF0727BBE9; Thu, 24 Aug 2023 05:17:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 E51F627BBE2 for ; Thu, 24 Aug 2023 05:17:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ1mG-0007XK-SJ; Thu, 24 Aug 2023 00:17:00 -0400 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 1qZ1mF-0007X1-CA for guix-patches@gnu.org; Thu, 24 Aug 2023 00:16:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ1mF-0005fe-37 for guix-patches@gnu.org; Thu, 24 Aug 2023 00:16:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZ1mI-0004YD-QG for guix-patches@gnu.org; Thu, 24 Aug 2023 00:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH 53/61] gnu: gtk-doc: Rewrite with G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Aug 2023 04:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169285059617406 (code B ref 65479); Thu, 24 Aug 2023 04:17:02 +0000 Received: (at 65479) by debbugs.gnu.org; 24 Aug 2023 04:16:36 +0000 Received: from localhost ([127.0.0.1]:35795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1lo-0004WW-Ty for submit@debbugs.gnu.org; Thu, 24 Aug 2023 00:16:36 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:42320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1lk-0004WJ-7G for 65479@debbugs.gnu.org; Thu, 24 Aug 2023 00:16:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id B852C20883 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:16:23 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DDD208009B for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:16:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id rgewUaRr13tM for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:16:21 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 8C0CE8009A for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:16:21 +0200 (CEST) From: Bruno Victal Date: Thu, 24 Aug 2023 05:16:21 +0100 Message-Id: <3088135f835891277e1d968ba047eb18d2e740b2.1692828533.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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/gtk.scm (gtk-doc): Rewrite with G-Expressions. --- gnu/packages/gtk.scm | 46 +++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f842f0e15a..a89d5709cc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2170,36 +2170,38 @@ (define-public gtk-doc (search-patches "gtk-doc-respect-xml-catalog.patch")))) (build-system meson-build-system) (arguments - `(#:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-gtk-doc-scan - (lambda* (#:key inputs #:allow-other-keys) + (list + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-gtk-doc-scan + ;; Use a substitution to avoid setting docbook-xsl as a + ;; propagated input. + (lambda _ (substitute* "gtk-doc.xsl" (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/html/chunk.xsl")) + #$(let ((docbook-xsl (this-package-input "docbook-xsl"))) + (file-append docbook-xsl + "/xml/xsl/" (package-name docbook-xsl) + "-" (package-version docbook-xsl) + "/html/chunk.xsl"))) (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) - #t)) + #$(let ((docbook-xsl (this-package-input "docbook-xsl"))) + (file-append docbook-xsl + "/xml/xsl/" (package-name docbook-xsl) + "-" (package-version docbook-xsl) + "/common/en.xsl")))))) (add-after 'unpack 'disable-failing-tests (lambda _ (substitute* "tests/Makefile.am" (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh program.sh") - "")) - #t)) + "")))) (add-after 'install 'wrap-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (prog) - (wrap-program prog - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) - (find-files (string-append out "/bin"))))))))) + (lambda _ + (for-each (lambda (prog) + (wrap-program prog + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) + (find-files (string-append #$output "/bin")))))))) (native-inputs (list gettext-minimal `(,glib "bin")