| Message ID | 6501aeb5c69077b39f06da147917dc0ca9d9fc95.1696881354.git.mirai@makinata.eu |
|---|---|
| State | New |
| Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA1EA27BBE9; Mon, 9 Oct 2023 21:08:36 +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 E678127BBE2 for <patchwork@mira.cbaines.net>; Mon, 9 Oct 2023 21:08:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qpwXi-0005ri-CQ; Mon, 09 Oct 2023 16:07:54 -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 <Debian-debbugs@debbugs.gnu.org>) id 1qpwXd-0005pE-Hv for guix-patches@gnu.org; Mon, 09 Oct 2023 16:07:49 -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 <Debian-debbugs@debbugs.gnu.org>) id 1qpwXd-0007tc-9f for guix-patches@gnu.org; Mon, 09 Oct 2023 16:07:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qpwXx-0002Un-VM for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 36/63] gnu: metapixel: Drop docbook workaround. Resent-From: Bruno Victal <mirai@makinata.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:08:09 +0000 Resent-Message-ID: <handler.65479.B65479.16968820819421@debbugs.gnu.org> 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 <mirai@makinata.eu> Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.16968820819421 (code B ref 65479); Mon, 09 Oct 2023 20:08:09 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:01 +0000 Received: from localhost ([127.0.0.1]:33294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qpwXo-0002Rg-UH for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:01 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:54928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mirai@makinata.eu>) id 1qpwXi-0002QX-04 for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:07:54 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id A839720CE7 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 305EA80099; Mon, 9 Oct 2023 22:07:32 +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 FEI76Q1q1mtH; Mon, 9 Oct 2023 22:07:31 +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 61FD78009E; Mon, 9 Oct 2023 22:07:29 +0200 (CEST) From: Bruno Victal <mirai@makinata.eu> Date: Mon, 9 Oct 2023 21:06:24 +0100 Message-ID: <6501aeb5c69077b39f06da147917dc0ca9d9fc95.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1696881354.git.mirai@makinata.eu> References: <cover.1692828533.git.mirai@makinata.eu> <cover.1696881354.git.mirai@makinata.eu> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
| Series |
Docbook & XML/SGML improvements
|
expand
|
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 9b633d5d63..639d584c13 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1569,7 +1569,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 @@ -1582,13 +1582,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"))