From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2Hq6KVAFD2UuDQAAG6o9tA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 17:33:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2Hq6KVAFD2UuDQAAG6o9tA (envelope-from ) for ; Sat, 23 Sep 2023 17:33:36 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 66113341D1 for ; Sat, 23 Sep 2023 17:33:36 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695483216; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=xRBrk1NLwDw6L50XMNXq9rDnhfOAQpHDpuWPTK5JenQ=; b=bkLhfTKDXVHv2GeID61lEdoqtq+r6EFal6cnAXXji81UNsKUOqfZEzzqCyB2gOfi1Faobn lFTRD8/qEqs8+Y7w5xA6sCqLdy4ooUsv25B6AM6+srAmpljaPLMnHk1jT9esRMDqu4CDQj 8aI/iiOJ0Du1Fc+JdFhEQYY4CX1VWY4Hk1YssFbUirFjHSv/grOxphp3ZEBVluXoFi9DIb ACJuO+iiBg5+sOjb1NTzUxyy316EJ/6iMuOGFxuhW5Awaq90hen5/1MEqwhim8cnjryaQi XgOVmuv3EaOe3ZIXFSFPBxaB/IFo3ZNwPY8GkfM3AM1p9cxIteIVbQWTLKxdyQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695483216; a=rsa-sha256; cv=none; b=mRVsEr31/HJgPJVpMNRDkSXbvA757nbYqjGtl/4igjbR5clk0C3JsqGV8AraPucEg+zd9t g0EFit2I3Fpk5X8Gzkcf5ao5pn2uASxsltoCbC3gLrZMQCSQwjHHhPvKCfGKepihJTcdPG sBTIcGrMmGmC89Z7g6kb5Sot2MotsLaPD2eabEeR3CirXTIGHtgbY4e5+x/+xXXrgd948z fYg5FEicuZfflAfzPEG5V/+1BOybDFSODQSjbX43Nmr98g2tJlqX5dhkVoG9BvQp2scg0v RbZvCxYS6GZrk4M3/NM/qBxRSA+xpq06MWMKRqIeysbzw4GfaKy5y0ruWCMdWQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -3.24 X-Spam-Score: -3.24 X-Migadu-Queue-Id: 66113341D1 X-TUID: VB9LR+K+eXiT 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") -- 2.41.0