From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 yCnTJmuK5mRnvQAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iM5fJmuK5mSyzwAAauVa8A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:35 +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 4462A4CC53 for ; Thu, 24 Aug 2023 00:38:35 +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=1692830315; 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=C8cJ/l21kC4dgVlGvi3+KewXw6tFwfmq2U9b4Q3Jx+Q=; b=V2WkNydXURa3fqTFX77pvBfwQpl+gdZ1p2ajkdjiPnCVrgQYOnaFvtaPRURAZgFyy6NzPi a9jbs9GQfRtcDhEbg3Tzh5QpqTBUbsNW84/KqSyWBeIFOCSki2Kn6Mm84k07A7OgB9syVQ m/r5RIMNjeWpDE+9O8siHAgtx5Giu0Vert2X4e7k4JDJnHtWEyG5H6E1hmH/fZ5ToVvktD iJlcyfzK4au14cY/8IqppJ7eIX9btR6aPY/UKWVNIA9O30S0ky4f7gyt7SvWdJBOO6mxLT W34aR3QHkHzqg2Lo7OA1ahK0CQ1ze/hj7QpTIKAIvgaGK7vvtSc2q1g9Fo+AHw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830315; a=rsa-sha256; cv=none; b=rfbKyz9nJ0kN9KWXenJUENzbDVuU2bs4M7BV/8erEoiTGITTXCiewOOCY94azYnEmwVBak SX4OTwwCsnxQkzAWekW8l6A6moo4SuiouLa09CI3KGkdbNhzDrwG1UPp55Axc9de2DDX/R yrV4bmrx5SCFeDBhzt3rcvd/lut0FHyP0Uun28Y3cwtjcnC5Z7SeznF++uPeXqKwOoz6Cj 6IMrRx5zKq4/XE52nDX80S3iuyVuho4AV4BFpjWHV3g3kR3nhfyQ4KwqdhzankAH35D8Iw 8tHQ5fVduviZrqg//0O+y33b/n/rtMl0YmluIkkUWZd8fhSx0XrISrLv+vEIyQ== 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTZ-0008MR-0q; Wed, 23 Aug 2023 18:37:21 -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 1qYwTN-0007qn-Q1 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:09 -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 1qYwTL-0004xQ-Ov for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTP-0004Ce-9N for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 24/61] gnu: docbook2x: Drop docbook-xml workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:11 +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.169283021715869 (code B ref 65479); Wed, 23 Aug 2023 22:37:11 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:57 +0000 Received: from localhost ([127.0.0.1]:35392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTB-00047l-2R for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:57 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:33700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSm-00043l-4V for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 6FC1820CFB for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 155B88005B; Thu, 24 Aug 2023 00:36:14 +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 cac07Yc7yfmF; Thu, 24 Aug 2023 00:36:12 +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 A221880097; Thu, 24 Aug 2023 00:36:12 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:16 +0100 Message-Id: <664353eda4e220bbacb9ebd7175600e37472f7c9.1692830149.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 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.71 X-Spam-Score: -3.71 X-Migadu-Queue-Id: 4462A4CC53 X-Migadu-Scanner: mx1.migadu.com X-TUID: UZ0u6h5kHoaW * 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.40.1