Message ID | cover.1682469248.git.mirai@makinata.eu |
---|---|
Headers |
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 E390427BBE9; Wed, 26 Apr 2023 01:54:18 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 4EBFF27BBE2 for <patchwork@mira.cbaines.net>; Wed, 26 Apr 2023 01:54:18 +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 1prTQ7-0006Di-16; Tue, 25 Apr 2023 20:54:07 -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 1prTQ4-0006DB-Al for guix-patches@gnu.org; Tue, 25 Apr 2023 20:54:04 -0400 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 <Debian-debbugs@debbugs.gnu.org>) id 1prTQ4-0000S6-19 for guix-patches@gnu.org; Tue, 25 Apr 2023 20:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1prTQ2-0001R1-AO; Tue, 25 Apr 2023 20:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63081] [PATCH 0/8] Comprehensive DocBook refactoring. Resent-From: Bruno Victal <mirai@makinata.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: maxim.cournoyer@gmail.com, andreas@enge.fr, guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2023 00:54:02 +0000 Resent-Message-ID: <handler.63081.B.16824703955455@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63081@debbugs.gnu.org Cc: Bruno Victal <mirai@makinata.eu>, maxim.cournoyer@gmail.com, andreas@enge.fr X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: maxim.cournoyer@gmail.com, andreas@enge.fr Received: via spool by submit@debbugs.gnu.org id=B.16824703955455 (code B ref -1); Wed, 26 Apr 2023 00:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Apr 2023 00:53:15 +0000 Received: from localhost ([127.0.0.1]:53826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1prTPG-0001Pv-St for submit@debbugs.gnu.org; Tue, 25 Apr 2023 20:53:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:39910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mirai@makinata.eu>) id 1prTPE-0001Pk-9p for submit@debbugs.gnu.org; Tue, 25 Apr 2023 20:53: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 <mirai@makinata.eu>) id 1prTPD-00068i-Si for guix-patches@gnu.org; Tue, 25 Apr 2023 20:53:11 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <mirai@makinata.eu>) id 1prTPC-0000DW-8X for guix-patches@gnu.org; Tue, 25 Apr 2023 20:53:11 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 1B93A21E88 for <guix-patches@gnu.org>; Wed, 26 Apr 2023 02:52:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 99AC58009F; Wed, 26 Apr 2023 02:52:59 +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 wZK90YOVYgmk; Wed, 26 Apr 2023 02:52:59 +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 2CF068009E; Wed, 26 Apr 2023 02:52:59 +0200 (CEST) From: Bruno Victal <mirai@makinata.eu> Date: Wed, 26 Apr 2023 01:52:53 +0100 Message-Id: <cover.1682469248.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.107.240; envelope-from=mirai@makinata.eu; helo=smtpmciv4.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, T_SCC_BODY_TEXT_LINE=-0.01 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: <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 |
Comprehensive DocBook refactoring.
|
|
Message
Bruno Victal
April 26, 2023, 12:52 a.m. UTC
Notable changes: * Fixes profile conflicts for docbook-xml packages by using versioned paths. * Implements the path convention used by NixOS for docbook-xml 4.x packages, this allows for packages that use cmake to search for these files (such as kdoctools) to work correctly without having to patch the sources. * Stores the schema files correctly rather than lumping it all within …/dtd/. * Source fetching methods were reviewed and were fixed where incorrect. (docbook-xml-5.1) * Unbundles binary leftovers in docbook-xsl-1.79.1 packages. * Removes executable permissions for SGML DTDs. * Uses proper tools to manipulate XML instead of substitute*. * Uses sxml instead of representing XML as a string. * Fixes tests for docbook-xsl. * Uses copy-build-system over trivial-build-system. * Modernizes the style used for the package definitions. It is hoped that these patches will substantially reduce the amount of source patching done in guix and solve obscure build failures. This patch-series is “Core-Updates” material, it will trigger mass rebuilds. Bruno Victal (8): gnu: docbook-xml: Fix installation paths. gnu: Add docbook-xml-5.0.1. gnu: docbook-xsl: Refactor package. gnu: docbook-xsl-1.79.1: Refactor package. gnu: docbook-utils: Refactor package. gnu: docbook: Refactor docbook-sgml packages. gnu: docbook: Refactor dblatex packages. gnu: docbook-dsssl: Switch to copy-build-system. gnu/packages/docbook.scm | 875 +++++++++++++++++++++++---------------- 1 file changed, 507 insertions(+), 368 deletions(-) base-commit: 8093c6ba21c51efe901ba98ce698c545bf13dcd0
Comments
Hi, Bruno Victal <mirai@makinata.eu> writes: > Notable changes: > * Fixes profile conflicts for docbook-xml packages by using versioned paths. > * Implements the path convention used by NixOS for docbook-xml 4.x packages, > this allows for packages that use cmake to search for these files (such as kdoctools) > to work correctly without having to patch the sources. > * Stores the schema files correctly rather than lumping it all within …/dtd/. > * Source fetching methods were reviewed and were fixed where incorrect. (docbook-xml-5.1) > * Unbundles binary leftovers in docbook-xsl-1.79.1 packages. > * Removes executable permissions for SGML DTDs. > * Uses proper tools to manipulate XML instead of substitute*. > * Uses sxml instead of representing XML as a string. > * Fixes tests for docbook-xsl. > * Uses copy-build-system over trivial-build-system. > * Modernizes the style used for the package definitions. I've applied this locally on core-updates and made some cosmetic changes, but attempting to build the various touched packages led to this newly introduced elogind failure: --8<---------------cut here---------------start------------->8--- CMakeFiles/LLVMObjectYAML.dir/yaml2obj.cpp.o --xinclude --maxdepth 9000 --stringparam man.output.quietly 1 --stringparam funcsynopsis.style ansi --stringparam man.authors.section.enabled 0 --stringparam man.copyright.section.enabled 0 --stringparam elogind.version 246.10 --path /tmp/guix-build-elogind-246.10.drv-0/build/man:/tmp/guix-build-elogind-246.10.drv-0/source/man ../source/man/custom-man.xsl ../source/man/sd_bus_add_object.xml I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ../source/man/sd_bus_add_object.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> ^ I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ../source/man/sd_bus_add_match.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> ^ I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd ../source/man/libelogind-pkgconfig.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> ^ ../source/man/sd_bus_add_match.xml:157: element include: XInclude error : could not load ../source/man/libelogind-pkgconfig.xml, and no fallback was found ../source/man/sd_bus_add_object.xml:44: element include: XInclude error : could not load ../source/man/sd_bus_add_match.xml, and no fallback was found I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd ../source/man/libelogind-pkgconfig.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> ^ [339/540] Generating man/pam_elogind.8 with a custom command I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ../source/man/pam_elogind.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> ^ Note: namesp. add : added namespace before processing pam_elogind [340/540] Generating man/sd_bus_add_node_enumerator.3 with a custom command I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ../source/man/sd_bus_add_node_enumerator.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> ^ I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd ../source/man/libelogind-pkgconfig.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> ^ Note: namesp. add : added namespace before processing sd_bus_add_node_enumerator [341/540] Linking target pam_elogind.so [342/540] Linking target src/shared/libelogind-shared-246.10.so ninja: build stopped: subcommand failed. error: in phase 'build': uncaught exception: %exception #<&invoke-error program: "ninja" arguments: ("-j" "24") exit-status: 1 term-signal: #f stop-signal: #f> phase `build' failed after 12.5 seconds command "ninja" "-j" "24" failed with status 1 builder for `/gnu/store/836v9khss2hdrzqwwwxm3856la5agzl2-elogind-246.10.drv' failed with exit code 1 @ build-failed /gnu/store/836v9khss2hdrzqwwwxm3856la5agzl2-elogind-246.10.drv - 1 builder for `/gnu/store/836v9khss2hdrzqwwwxm3856la5agzl2-elogind-246.10.drv' failed with exit code 1 --8<---------------cut here---------------end--------------->8--- Would you have an idea of what went wrong here?
Hello Bruno, Bruno Victal <mirai@makinata.eu> writes: > Notable changes: > * Fixes profile conflicts for docbook-xml packages by using versioned paths. > * Implements the path convention used by NixOS for docbook-xml 4.x packages, > this allows for packages that use cmake to search for these files (such as kdoctools) > to work correctly without having to patch the sources. > * Stores the schema files correctly rather than lumping it all within …/dtd/. > * Source fetching methods were reviewed and were fixed where incorrect. (docbook-xml-5.1) > * Unbundles binary leftovers in docbook-xsl-1.79.1 packages. > * Removes executable permissions for SGML DTDs. > * Uses proper tools to manipulate XML instead of substitute*. > * Uses sxml instead of representing XML as a string. > * Fixes tests for docbook-xsl. > * Uses copy-build-system over trivial-build-system. > * Modernizes the style used for the package definitions. I've applied it to core-updates, with some light edits. If you know of any packages that could be streamlined thanks to it, please send patches doing so, marked for core-updates. Closing for now,