From patchwork Sat Sep 23 14:20:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54215 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 8F9A427BBEA; Sat, 23 Sep 2023 16:33:15 +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 9A5EB27BBE2 for ; Sat, 23 Sep 2023 16:33:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk4cn-0004If-DL; Sat, 23 Sep 2023 11:32:53 -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 1qk4cm-0004G5-1g for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:52 -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 1qk4cl-00015Z-OH for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk4cw-0004Jp-UA for guix-patches@gnu.org; Sat, 23 Sep 2023 11:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 35/62] gnu: metapixel: Drop docbook workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 15:33: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 Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169548312616287 (code B ref 65479); Sat, 23 Sep 2023 15:33:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 15:32:06 +0000 Received: from localhost ([127.0.0.1]:40352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4c2-0004EQ-6U for submit@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:06 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:44898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4bw-0004Cx-OX for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:02 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 19DDC20E00 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 17:31:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 71E1380092; Sat, 23 Sep 2023 17:31:40 +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 JZ1161tBSWmA; Sat, 23 Sep 2023 17:31:40 +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 CA03F8005B; Sat, 23 Sep 2023 17:31:39 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:10 +0100 Message-ID: <88acac4939982caeba362444ac7aacf45a8daac1.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 * gnu/packages/image-processing.scm (metapixel)[arguments]<#:phases>: Drop 'make-local-docbook-xml phase. [native-inputs]: Use docbook-xml-4.2 instead of docbook-xml. --- gnu/packages/image-processing.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 8fc93a8842..83d4e90f79 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1534,7 +1534,7 @@ (define-public metapixel ("perl" ,perl))) (native-inputs `(("pkg-config" ,pkg-config) - ("docbook-xml" ,docbook-xml) + ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("xsltproc" ,libxslt))) (arguments @@ -1547,13 +1547,6 @@ (define-public metapixel #:phases (modify-phases %standard-phases (delete 'configure) - (add-before 'install 'make-local-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "metapixel.xml" - (("http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))) - #t)) (add-before 'install 'fix-directory-creation (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "out") "/share/man/man1"))