From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gLgPCHhuJGXHvQAA9RJhRA:P1 (envelope-from ) for ; Mon, 09 Oct 2023 23:19:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gLgPCHhuJGXHvQAA9RJhRA (envelope-from ) for ; Mon, 09 Oct 2023 23:19:52 +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 0CB5760F5B for ; Mon, 9 Oct 2023 23:19:52 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696886392; 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=WzqqJbbZlRtUooBWgozFNRQvXDYuRlJyg0a6PDoPq5Y=; b=qfgkHvKRBr3g3NMOxbJeEEU1Y/H2GzMGke6M9b0cxPmobMMTk5t+8w7DdRYBCFyCdgQY3w aX3xs3nT+K/s8/kZRYXD49emyhtJo3YJX+ImlP6Sggt/LNxBvC/wALiimOLj6A3o7L+HRU fwGjb98P0nlyC2Q6hlLi8LMocA/MeFdJpZkg/mpsGmjOPfM4qQEfKOWjGSV8rlDrawq4iP k+ROUEoQUbtj4apdwfYVp7fMPBH5hp/JPfFUVFisUSltQmuVDou+myH6tRUbET3gi3/beg Xje3L10NPTaYZTe1NG+meJE0UrvOtUFzR4m6Iq5QWmKSu/gd0yM3CmYfKkHjhA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696886392; a=rsa-sha256; cv=none; b=j8GZxNgS8DhRLUfoVhTA8HRQ9laKNbQYLkwYu7ucH//mw4h9mstXfkgO/YMc7On5SlPx1V myNB4mTyp59JP80EXZ4VL2rP8G3eUZC3juXjdKaB+g3CBz52VZZyflnkq6iVdprDSAhk6K NsIYPLNvaGPV/0PkjHoT/YN3ADwsqaO8Mx7HyZHhqkUhwqPq6NZPXLMPmHv6Qf4VjN2HMD ahiklvSAbDnSCiwIX+ok4cdB9iKEyVDFz1Dj69iN6uiFoATxhYxryX2BLojUh2L2EgWaKN GmyoFf7dKzrthmnGKXTe0v6C1EpxGcEDeVWLvGy6wzdnHLUEDs/0NUuY62ZtOQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpxeO-0007Y6-6s; Mon, 09 Oct 2023 17:18:52 -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 1qpxeI-0007Ul-DY for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -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 1qpxeI-0006yO-0j for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpxec-0007ev-7u; Mon, 09 Oct 2023 17:19:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 54/63] gnu: gtk-doc: Rewrite with G-Expressions. 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: Mon, 09 Oct 2023 21:19:06 +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.169688632029277 (code B ref 65479); Mon, 09 Oct 2023 21:19:06 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 21:18:40 +0000 Received: from localhost ([127.0.0.1]:33533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxe8-0007c0-Pg for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:40 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:57080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxe3-0007bn-HI for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:35 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id 14FB8203C4 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 23:17:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 822DA8009D; Mon, 9 Oct 2023 23:17:41 +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 pq6vQAFg4Nmy; Mon, 9 Oct 2023 23:17:39 +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 3E4BF80095; Mon, 9 Oct 2023 23:17:39 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:42 +0100 Message-ID: <44e2151eb152fa73de986d4e46f612351d012007.1696881354.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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 0CB5760F5B X-Spam-Score: -3.23 X-Migadu-Spam-Score: -3.23 X-Migadu-Scanner: mx1.migadu.com X-TUID: ouDgiaPAWd8L * 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 dcb503fb6a..f4c9ac6e9e 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.41.0