From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id II9FC6eJ5mQcKgEASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:35:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mM83C6eJ5mQSMAEA9RJhRA (envelope-from ) for ; Thu, 24 Aug 2023 00:35:19 +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 6CD6F69D43 for ; Thu, 24 Aug 2023 00:35:18 +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-Seal: i=1; s=key1; d=yhetil.org; t=1692830119; a=rsa-sha256; cv=none; b=IpIN+f2r5YmfwCn0bvpT5tJK3S+wuHOt0iFiPs9+Jb3NcMnnAbTlV0w+dA5V1O+hVaK7M3 hvkMxZzYI9WbBjuhxmR4sC/mR81IOXMqXFjjsslXIdRK2SviW9G+lg3+spIAvdrLYfQqze uwLwZMuWTlddjeBatDcdQkfxVXABlh5MTCQ7k81KDJ7T/18jC0a23+9kjnmdxoRdBRKNi4 9EeCPvj4LZOsuWKojhaijdjFOYzK6xkggSz/BY/+UwZr8knamQLDzfgMjldQWNlwqnTOXZ grLxsNR69qOA/GE/OFSbWKb9EBJ3qljSlo8MFzwcV5O6YqqPlRrEJ+mvxGSWig== 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692830119; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+0D+5Y7Dr3pyfReWeTg89wK3mljU7d47KecgPswJ4I4=; b=dobcLHKnxuzDk1dDmW3wr7xWT4H+TgB9vBzbXQPlUXEkxNKYxHQ7r2L7QkVJnt+IaFjdlS 6vIVgyR9wfXI90dPm+WGOUmnwNkZEDoa4OQTwmqxlKFmyZgz8fv/987JHx8ihpJzHfQmFG 7v1IawDmHlrEWupgiYA0oTbEOoTrDJ14hAyqpasL+8FEu8JCQuVIgx62hKwb0ATeLlP9ZV nFKagT32ai8rlpWPloP+UlweWY25KREBydHK9IkvFUExcFJw3e6LF76BFlbsPQFf9j2mcV IJyCBiRdnGsG51IsMy01G6CKGtN7BgBUmPEJYtnJQfFTBkW2uL4n4CjuQc++FA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwRL-0005AD-Qq; Wed, 23 Aug 2023 18:35:03 -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 1qYwRJ-00059t-P8 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:35:01 -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 1qYwRI-0004O2-RW; Wed, 23 Aug 2023 18:35:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwRK-0003xm-3g; Wed, 23 Aug 2023 18:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 00/61] The Draining of the XML & DocBook Swamp. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, gemmaro.dev@gmail.com, ludo@gnu.org, liliana.prikler@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal , maxim.cournoyer@gmail.com, gemmaro.dev@gmail.com, ludo@gnu.org, liliana.prikler@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: maxim.cournoyer@gmail.com, gemmaro.dev@gmail.com, ludo@gnu.org, liliana.prikler@gmail.com, rg@raghavgururajan.name Received: via spool by submit@debbugs.gnu.org id=B.169283005415167 (code B ref -1); Wed, 23 Aug 2023 22:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Aug 2023 22:34:14 +0000 Received: from localhost ([127.0.0.1]:35309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwQY-0003wX-3A for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:34:14 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwQW-0003wI-Dz for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:34:13 -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 1qYwQN-0003cd-67 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:34:03 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYwQK-0004Hy-6C for guix-patches@gnu.org; Wed, 23 Aug 2023 18:34:02 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 319D920724 for ; Thu, 24 Aug 2023 00:33:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 489BA80092; Thu, 24 Aug 2023 00:33:45 +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 m32-jW3SEDaQ; Thu, 24 Aug 2023 00:33:44 +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 747A78005B; Thu, 24 Aug 2023 00:33:44 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:33:43 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.105.232; envelope-from=mirai@makinata.eu; helo=smtpm1.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Scanner: mx0.migadu.com X-Spam-Score: -0.71 X-Migadu-Queue-Id: 6CD6F69D43 X-Migadu-Spam-Score: -0.71 X-TUID: aWcXhJpHTPzu This is a follow-up for and brings several QoL improvements for handling XML/XSL dependencies in packages. Notable changes: * Rebased against core-updates. * Fixes profile conflicts for docbook-xml packages by using versioned paths. This is required for multiple docbook-xml packages to coexist within the same profile, a must when authoring or validating DocBook documents. * Stores the schema files correctly rather than lumping it all within .../dtd/. * New search-paths: $XML_CATALOG_FILES and $SGML_CATALOG_FILES. * Reduces direct dependencies on libxml2. * Integrates some patches from Debian for docbook2x and docbook-utils. * Fixes dblatex not finding the necessary binaries and texlive extensions. * Several packages are now able to build their manpage and info docs. Notes: * Integrates the first patch from . Bruno Victal (61): gnu: docbook-xml: Fix installation paths. gnu: Add docbook-xml-5.0.1. gnu: docbook-xml-5.1: Fix URIs in catalog.xml. gnu: docbook-xsl: Add compatibility entry. gnu: docbook-xsl: Add rewrite entries for http. gnu: docbook: Remove leftovers. gnu: docbook-utils: Import patches from debian. gnu: docbook2x: Import patches from debian. gnu: docbook2x: Fix sgml2xml-isoent and add test dependencies. gnu: docbook2x: Split documentation. gnu: libxml2: Rewrite using G-Expressions. search-paths: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES. gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path. gnu: libxslt: Set search-paths for XML and SGML catalogs. gnu: dblatex: Add libxslt native-search-paths to its own. gnu: dblatex: Split documentation. gnu: Add docbook-mathml-1.0. gnu: dblatex: Fix missing texlive binaries. gnu: lilypond: Use dblatex/stable. gnu: docbook2x: Set search-paths for XML and SGML catalogs. gnu: xmlto: Rewrite with G-Expressions. gnu: xmlto: Add libxslt native-search-paths to its own. gnu: gtk-doc: Add libxslt native-search-paths to its own. gnu: docbook2x: Drop docbook-xml workarounds. gnu: secilc: Drop xmlto workaround. gnu: xdg-utils: Drop docbook workarounds. gnu: xdg-user-dirs: Drop docbook workaround. gnu: udisks: Rewrite using G-Expressions. gnu: udisks: Drop docbook workaround. gnu: colord-gtk: Build documentation. gnu: criu: Drop xmlto workaround. gnu: gtk: Drop docbook workaround. gnu: git-crypt: Remove docbook workarounds. gnu: gnome-session: Build documentation. gnu: metapixel: Drop docbook workaround. gnu: metapixel: Rewrite with G-Expressions. gnu: libxkbcommon: Add doc output. gnu: libxkbcommon: Faux propagate libxml2. gnu: gnome-session: Remove libxml2. gnu: sssd: Drop xmllint workaround. gnu: tdb: Build manpages. gnu: drumstick: Drop docbook workaround. gnu: vmpk: Drop docbook workaround. gnu: iputils: Drop docbook workarounds. gnu: iputils: Restyle. gnu: libnotify: Drop docbook workarounds. gnu: libnotify: Split documentation. gnu: alsa-utils: Build manpages. gnu: alsa-utils: Rewrite with G-Expressions. gnu: tunctl: Update comment. gnu: gdcm: Build manpages. gnu: git: Drop docbook workarounds. gnu: gtk-doc: Rewrite with G-Expressions. gnu: gtk-doc: Wrap XML_CATALOG_FILES. gnu: gtk-doc: Remove leftovers. gnu: libstdc++-doc: Rewrite with G-Expressions. gnu: libstdc++-doc: Build libstdc++ info documentation. gnu: perf: Remove libxml2. gnu: Remove unneeded libxml2 from native-inputs. (libxslt) gnu: Remove unneeded libxml2 from native-inputs. (xmlto) gnu: Remove unneeded libxml2 from native-inputs. (gtk-doc) doc/guix.texi | 24 +- gnu/local.mk | 19 +- gnu/packages/benchmark.scm | 1 - gnu/packages/bioinformatics.scm | 6 +- gnu/packages/cluster.scm | 1 - gnu/packages/databases.scm | 6 +- gnu/packages/docbook.scm | 684 ++++++++++++------ gnu/packages/freedesktop.scm | 194 ++--- gnu/packages/gcc.scm | 59 +- gnu/packages/glib.scm | 1 - gnu/packages/gnome.scm | 37 +- gnu/packages/gtk.scm | 53 +- gnu/packages/image-processing.scm | 51 +- gnu/packages/linux.scm | 58 +- gnu/packages/moreutils.scm | 2 +- gnu/packages/music.scm | 30 +- gnu/packages/networking.scm | 63 +- gnu/packages/ocr.scm | 1 - .../patches/dblatex-inkscape-1.0.patch | 39 + .../docbook-utils-documentation-edits.patch | 100 +++ .../docbook-utils-escape-characters.patch | 34 + .../docbook-utils-remove-jade-sp.patch | 215 ++++++ ...book-utils-respect-refentry-for-name.patch | 34 + .../docbook-utils-source-date-epoch.patch | 29 + .../docbook-utils-use-date-element.patch | 61 ++ ...ocbook-xsl-nonrecursive-string-subst.patch | 40 - .../patches/docbook-xsl-support-old-url.patch | 17 - .../patches/docbook2x-filename-handling.patch | 42 ++ .../patches/docbook2x-manpage-typo.patch | 24 + .../docbook2x-preprocessor-declaration.patch | 89 +++ .../docbook2x-static-datadir-evaluation.patch | 19 + ...gcc-13.2.0-libstdc++-docbook-xsl-uri.patch | 50 ++ ...cc-13.2.0-libstdc++-info-install-fix.patch | 70 ++ .../gcc-5.5.0-libstdc++-xmlcatalog.patch | 402 ++++++++++ .../patches/libsepol-versioned-docbook.patch | 56 ++ gnu/packages/perl.scm | 7 +- gnu/packages/polkit.scm | 1 - gnu/packages/rpm.scm | 3 +- gnu/packages/samba.scm | 3 +- gnu/packages/security-token.scm | 5 +- gnu/packages/selinux.scm | 13 +- gnu/packages/sssd.scm | 8 +- gnu/packages/terminals.scm | 1 - gnu/packages/version-control.scm | 53 +- gnu/packages/virtualization.scm | 10 - gnu/packages/wm.scm | 3 +- gnu/packages/xdisorg.scm | 32 +- gnu/packages/xml.scm | 83 +-- guix/search-paths.scm | 25 + 49 files changed, 2084 insertions(+), 774 deletions(-) create mode 100644 gnu/packages/patches/dblatex-inkscape-1.0.patch create mode 100644 gnu/packages/patches/docbook-utils-documentation-edits.patch create mode 100644 gnu/packages/patches/docbook-utils-escape-characters.patch create mode 100644 gnu/packages/patches/docbook-utils-remove-jade-sp.patch create mode 100644 gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch create mode 100644 gnu/packages/patches/docbook-utils-source-date-epoch.patch create mode 100644 gnu/packages/patches/docbook-utils-use-date-element.patch delete mode 100644 gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch delete mode 100644 gnu/packages/patches/docbook-xsl-support-old-url.patch create mode 100644 gnu/packages/patches/docbook2x-filename-handling.patch create mode 100644 gnu/packages/patches/docbook2x-manpage-typo.patch create mode 100644 gnu/packages/patches/docbook2x-preprocessor-declaration.patch create mode 100644 gnu/packages/patches/docbook2x-static-datadir-evaluation.patch create mode 100644 gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch create mode 100644 gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch create mode 100644 gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch create mode 100644 gnu/packages/patches/libsepol-versioned-docbook.patch base-commit: c365cc69881f3aec633b88ba22c7fe8faec3597e -- 2.40.1