From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 EMFFDMT0DmWFVAAAG6o9tA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 16:23:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id EMFFDMT0DmWFVAAAG6o9tA (envelope-from ) for ; Sat, 23 Sep 2023 16:23:00 +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 E53EA462DC for ; Sat, 23 Sep 2023 16:22:59 +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=1695478979; 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=ILdZchc2fzQEVWWywE0uYtv0Bd/lMb7GtAG+jmp2t/c=; b=rK/n5lAoU2LZnzg4cF5626WnOT+2RHr3iCiPqlcLAVEbzzfBHivEZzo09mwRuqcx/WCAfg AXaijbDX9UQtX5oqVk+35eUh+u+wzzX2ZbKBsEoFfJi2MJtSAQ8wexIl4XUhZJTmO1q0wR R+rcaqLkRhHm8O0WEr8b3vvPo/zf8uxT0PtAVpXjOtwmmLbbdu+H+9jnaCO6P2TaHgoP0M xvySjgyFw1xUEAwS1DY2pi8IBjg7/+GxN24qxHtBnhxQtBIajOHPYUZiLqif8LIBWch40/ ippxjbnCIYH1brJZTgw0e8BSqXBQktRrLnTuZLxELHq2DZGG9RcVYwNeglE7UQ== 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=1695478979; a=rsa-sha256; cv=none; b=qUY26GgQKBsaNAx+lEkE9oo6oONa5W9yH1JcnK+AlcGRzmPSu8qynAA/GSv+eNVZJe387a aALqq35I3z8c5MiK9g5+PWBhlSqkWZuCbJciDgOp4LZ31leojVp2PXr9wLYJiIlw7pcaVH wm9TpfErm5tEYBjaTq7SB2kmxEU2rcIHLB3OKir5qjiIorxHlGd52N246wBEDG9+OK8Fgs Kxp+6HTckTpDpZyQQzcselUrGUtS67p9LW79RQFZRXAJUM6qDM4nNi+dXcK5eoYgygyexQ 5EpGUGBrslxNNaoesPAJtCCyjSMNwkgC2EBit6JknV90/ljaf+4sliixBQkOhQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3X4-0007X9-QT; Sat, 23 Sep 2023 10:22: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 ) id 1qk3X3-0007Ur-Ez for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:53 -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 1qk3X1-0003Jt-Fq for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3XC-00087p-Kr for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 24/62] gnu: docbook2x: Drop docbook-xml workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:23: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.169547895831096 (code B ref 65479); Sat, 23 Sep 2023 14:23:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:22:38 +0000 Received: from localhost ([127.0.0.1]:40250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Wn-00085R-NJ for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:38 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:42606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3WA-00080L-6P for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:21:58 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 1CBD420DB4 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 76B7B8009D; Sat, 23 Sep 2023 16:21:26 +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 zOf92Y8WFPOI; Sat, 23 Sep 2023 16:21:25 +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 A45A68009F; Sat, 23 Sep 2023 16:21:25 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:19:59 +0100 Message-ID: <35c14ed9039096db9d85aa92bc85d4492c923b4e.1695478390.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.70 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: E53EA462DC X-Spam-Score: -3.70 X-TUID: KO+OHcrPDacc * gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Drop 'patch-sources. [native-inputs]: Remove docbook-xml-4.5. --- gnu/packages/docbook.scm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 2f221866cc..e3de6bc00a 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -1013,18 +1013,6 @@ (define-public docbook2x (list #:phases #~(modify-phases %standard-phases - (add-after 'configure 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - ;; Patch all the tests use DocBook 4.5 - (substitute* (find-files "test" "\\.xml$") - (("\"-//OASIS//DTD DocBook XML V4\\..+//EN\"") - "\"-//OASIS//DTD DocBook XML V4.5//EN\"") - (("\"http://www\\.oasis-open\\.org/docbook/xml/4\\..+/docbookx.dtd\"") - "\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"")) - ;; Set XML catalogs for tests to pass - (setenv "XML_CATALOG_FILES" - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) (add-after 'unpack 'autoreconf (lambda _ (invoke "autoreconf" "-vif"))) @@ -1084,7 +1072,6 @@ (define-public docbook2x tidy-html ;; For tests docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4 - docbook-xml-4.5 groff-minimal libxml2)) (native-search-paths (list $XML_CATALOG_FILES $SGML_CATALOG_FILES)) (outputs '("out" "doc")) -- 2.41.0