From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id MN5WDm8FBmSbTAAASxT56A (envelope-from ) for ; Mon, 06 Mar 2023 16:23:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cCWADW8FBmSGBgAAG6o9tA (envelope-from ) for ; Mon, 06 Mar 2023 16:23:27 +0100 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 D0F8C10B51 for ; Mon, 6 Mar 2023 16:23:26 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678116207; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=Zbi/+9QdW6n/npFswLQlTdpeIjv50zyl+LW+wVIUJPs=; b=UX8qp7OyGM6aDMzjUasMNyOrrbTkcuElfW75iBtnXiBOolOck0kJF239xiJ2xNyJhEOwdb Qzq74lRJbrhTv0wTjWatKxT08NSF79eXKVgERuxxQVid3C2YAixtmmUjvynrCw1+r9Gqzi OWluTcRABG5DHYObmCLfw1m0FF3zVYOJVShQfpJlBt/QWS4rEzYWp+s6O3Yjo5aV5fFRCU oLUx0wiP5Zzh/ORrBf29jPXnjLsRB7V6p7Hdinv26PSyAX8u4htOEzcipSqbRRyi3OeGP6 HfBZA4PYkqhT7860hmITfgO7GEPdXQ1cAAXmxssBg/H57fhIdA9ay4rb14m3vw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678116207; a=rsa-sha256; cv=none; b=tZOdds6d2IXAk+O/bse546hz7wH26OEtn1YoaPc0Ajl4XvF/h7IFj2jHjTKRJd+Akk2TnA 6/b44rgm1r2oISKFy8a5/ouw/6uZNtUeHB46XkGvZNpt+AJL2fJdFHmiK6MjZKlF+tQ93T UEtNmixglJ6QppR6wfFu4srNw9tfJLxoheKJoMXEfMS+/ClIsk38tZJ5HKlWAVsD8zb995 tTK2IGYf0Ey0W7RMmx0St1j/HgVI/grFa/YeRthLpaq152gyMiX8wZEQB1hBKyAsliiml2 SWhEINZgXQXaWFrq0Te3wqRTwYXuiIoWvKailI1iMLXD9vCD2aFkgzh9OI+2AA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZCg4-0005cy-FY; Mon, 06 Mar 2023 10:23:04 -0500 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 1pZCg2-0005cJ-HG for guix-patches@gnu.org; Mon, 06 Mar 2023 10:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZCg2-0007zm-7M for guix-patches@gnu.org; Mon, 06 Mar 2023 10:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZCg2-0000uL-2h for guix-patches@gnu.org; Mon, 06 Mar 2023 10:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 0/9] Modernize and fix docbook-xml Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2023 15:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 61015@debbugs.gnu.org Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.16781161483425 (code B ref 61015); Mon, 06 Mar 2023 15:23:02 +0000 Received: (at 61015) by debbugs.gnu.org; 6 Mar 2023 15:22:28 +0000 Received: from localhost ([127.0.0.1]:43332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZCfT-0000tA-QB for submit@debbugs.gnu.org; Mon, 06 Mar 2023 10:22:28 -0500 Received: from smtpm5.myservices.hosting ([185.26.105.236]:33502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZCfS-0000t2-1J for 61015@debbugs.gnu.org; Mon, 06 Mar 2023 10:22:26 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 2770C20CB3 for <61015@debbugs.gnu.org>; Mon, 6 Mar 2023 16:22:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C77948009A; Mon, 6 Mar 2023 16:22:24 +0100 (CET) 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 IDOwvsTQhRoJ; Mon, 6 Mar 2023 16:22:23 +0100 (CET) Received: from [192.168.1.239] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id A00F880079; Mon, 6 Mar 2023 16:22:23 +0100 (CET) Message-ID: Date: Mon, 6 Mar 2023 15:22:23 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US References: From: Bruno Victal In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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: X-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: D0F8C10B51 X-Spam-Score: -2.51 X-Migadu-Spam-Score: -2.51 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-TUID: ICeaW8PCoJgY Though this patch-set brings improvements to docbook handling and doesn't seem to break anything, given that it's unlikely to make it to the upcoming core-updates merge, I'm thinking on reworking this patch-series a bit further: * Install the SGML and XML files in separate directories, supposedly some SGML tools choke if they find XML files while looking for SGML files. * Squash the 'copy-build-system' patches together since commits are not atomic due to package inheritance. * Rename patch-uri.xsl to patch-uri-catalog.xml. (Register it in gnu/local.mk ?) * Refactor the docbook-xsl packages. * Possibly factor out all of the docbook workarounds used by docbook dependent packages. Any thoughts before proceeding further? On 2023-01-23 03:31, Bruno Victal wrote: > This patch-series modernizes docbook-xml package definitions and > properly patches the catalog.xml paths using XSLT. > I've used XSLT here as it seems easier (and better documented) > to perform XML operations with it. I did a small prototype with > (sxml transforms) but due to guile-bug #20339, it's impossible to go > from sxml->xml, ruling it out from being a suitable replacement for XSLT. > > The situation for docbook-xml-4.1.2 could be considered extraordinary > since it's the only package that doesn't come with a catalog.xml file, > requiring a pre-built one to be used. (It can be generated from source, > by implementing a (PEG) parser for SGML catalogs but this seems > unnecessary for a file that is unlikely to see any changes.) > > With these changes, it's no longer required for packages to do > substitute* or other workarounds to coerce docbook-xml > to play nicely, libxml2 will automatically find the DTDs > through its native-search-path. (XML_CATALOG_FILES variable) > > A good follow-up to this patch-series would be to search and destroy > the workarounds currently employed by docbook-xml dependant packages > to discourage cargo-culting redundant procedures. > > > Bruno Victal (9): > gnu: docbook-xml: Use copy-build-system. > gnu: docbook-xml-4.1.2: Adapt to copy-build-system. > gnu: docbook-xml: Adapt to copy-build-system. > gnu: docbook-xml-4.4: Adapt to copy-build-system. > gnu: docbook-xml-4.3: Adapt to copy-build-system. > gnu: docbook-xml-4.2: Adapt to copy-build-system. > gnu: docbook-xml: Fix permissions. > gnu: docbook-xml: Use XSLT to patch catalog.xml. > gnu: docbook-xml-4.1.2: Add missing catalog.xml. > > .../xml/docbook-xml/catalog-4.1.2.xml | 31 +++++ > gnu/packages/aux-files/xml/patch-uri.xsl | 24 ++++ > gnu/packages/docbook.scm | 127 +++++++++--------- > 3 files changed, 116 insertions(+), 66 deletions(-) > create mode 100644 gnu/packages/aux-files/xml/docbook-xml/catalog-4.1.2.xml > create mode 100644 gnu/packages/aux-files/xml/patch-uri.xsl > > > base-commit: ca124b098dcc7ce7898df10faf9986f44a14e0a1