From patchwork Sat Sep 23 14:20:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54221 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 302DB27BBE9; Sat, 23 Sep 2023 16:33:38 +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=ham 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 4B9F027BBEA for ; Sat, 23 Sep 2023 16:33:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk4cu-0004PI-Jd; Sat, 23 Sep 2023 11:33: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 1qk4cs-0004NY-Ey for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:58 -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 1qk4cs-0001Be-5l for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk4d3-0004M1-Db; Sat, 23 Sep 2023 11:33:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 54/62] gnu: gtk-doc: Wrap XML_CATALOG_FILES. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 15:33:09 +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 Cc: Bruno Victal , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169548317016550 (code B ref 65479); Sat, 23 Sep 2023 15:33:09 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 15:32:50 +0000 Received: from localhost ([127.0.0.1]:40400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4ck-0004Ik-An for submit@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:50 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:43444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4cS-0004HE-3h for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id A51A420792 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 17:31:51 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 2018980092; Sat, 23 Sep 2023 17:31:51 +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 ansLSsXDsN2r; Sat, 23 Sep 2023 17:31:50 +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 A84998009F; Sat, 23 Sep 2023 17:31:49 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:29 +0100 Message-ID: <8165e60ec1cfc74fd1853bcc7fedf4118a37c76c.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 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 Prefer XML catalog resolution over substitutions on XML files. * gnu/packages/gtk.scm (gtk-doc)[arguments]<#:phases>: Remove 'patch-gtk-doc-scan. Wrap XML_CATALOG_FILES within 'wrap-executables. --- gnu/packages/gtk.scm | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 87ce01dc19..69e9a3250a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2174,23 +2174,6 @@ (define-public gtk-doc #: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") - #$(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") - #$(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" @@ -2198,10 +2181,17 @@ (define-public gtk-doc "")))) (add-after 'install 'wrap-executables (lambda _ - (for-each (lambda (prog) - (wrap-program prog - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) - (find-files (string-append #$output "/bin")))))))) + (let ((docbook-xsl-catalog + #$(let ((docbook-xsl (this-package-input "docbook-xsl"))) + (file-append docbook-xsl + "/xml/xsl/" (package-name docbook-xsl) + "-" (package-version docbook-xsl) + "/catalog.xml")))) + (for-each (lambda (prog) + (wrap-program prog + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("XML_CATALOG_FILES" " " suffix (,docbook-xsl-catalog)))) + (find-files (string-append #$output "/bin"))))))))) (native-inputs (list gettext-minimal `(,glib "bin")