From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kHWjFcnZ5mTUCQAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 06:17:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +PIxFcnZ5mSRxgAAauVa8A (envelope-from ) for ; Thu, 24 Aug 2023 06:17:13 +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 086723834A for ; Thu, 24 Aug 2023 06:17:13 +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=1692850633; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=XzPyZRztQ7VlxOk/EqpEjvhYWZ8I+rMK4pEPj9hhmRk=; b=Bbi7lr2N0deYz8NgWtggGta2dUK6XdSVk2ePFJMus4TPiBtYVfyySFH4QiBTkh+aJs8qKy bq/JcqgwZzPrfE6HkJtrFsRnc54evTlhHVvxvIP/1hXi5FrA6FYfmR/9uydjpJPqLnLsyM TKtUgN+Av9GzGLFsE9sbf79CxgY2xNUEtIr5GvcHw/wKxTjlYNAUSvrqiKbdMXNl7fn0DD rAi7r4O4g+sYg4DvN8EFJmNXDI3vUu1UZwuukVoxn9bAsegpF86rlGrimwELXZRV/59Rlb bChleB1XCPRmLoxXmDZnywq2d6YN7s/kVoRKjxoZFw7KnerzMKsKaCT7NI66AQ== 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692850633; a=rsa-sha256; cv=none; b=SV9WWwQgUIbWFNC4FhEBusakivoF3yKujn+6Ysm3jufqIguXVpCB0ciCbcrZuYQ7rLklHX zHFN3XPVI0dDk9gmUfpA+tsnGSESIv9SqczOsGZGqYrONe6E3Ws5LzvknozqT25FbxN3SQ 1jtAAiuoYQDNUUT7ykfR3b+KEGbsQLoKqYlwnJat6fxHMYKHRuIttBaOB/xB5Q/AIBz73b uH5PTj1fjddeoMCV2a8xYez2KifdaVR6AFPfqtC51Y2u5sydZjaTIlgErJBaMBMjmsXmvn vz1yX0CaV692kL61ra52hEHQ/2IJuUkz8vHLNkzsS8H6FZFAa/yegi1EOA0fCg== 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 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -4.71 X-Spam-Score: -4.71 X-Migadu-Queue-Id: 086723834A X-TUID: i/1bZwAQ/pBP * 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") -- 2.40.1