From patchwork Wed Aug 23 22:35:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53154 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 9818F27BBEA; Wed, 23 Aug 2023 23:39:47 +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 0BBBA27BBE2 for ; Wed, 23 Aug 2023 23:39:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTV-00085X-Qx; Wed, 23 Aug 2023 18:37:17 -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 1qYwTS-00082V-Nq for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:14 -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 1qYwTS-0004zr-FM for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTV-0004EK-1T for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 35/61] gnu: metapixel: Drop docbook workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:17 +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.169283022616062 (code B ref 65479); Wed, 23 Aug 2023 22:37:17 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:37:06 +0000 Received: from localhost ([127.0.0.1]:35419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTG-00049d-Kb for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:06 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:33742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSx-00045N-Ue for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:44 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 52D5A20CC3 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 41FFA80098; Thu, 24 Aug 2023 00:36:18 +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 plkZpsz1-_Mj; Thu, 24 Aug 2023 00:36:17 +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 77F7780060; Thu, 24 Aug 2023 00:36:16 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:27 +0100 Message-Id: <2d424368daa0ea41d900ee30c33c991ad748f627.1692830150.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 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 965eca82b7..e3c3bf56bf 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1516,7 +1516,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 @@ -1529,13 +1529,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"))