[PATCH core-updates 00/61] The Draining of the XML & DocBook Swamp.

+++ b/gnu/packages/docbook.scm

+ (list "rewriteSystem" "rewriteURI"))

+

+ ;; Originally the

+ ;; "http://docbook.sourceforge.net/release/xsl/"

+ ;; URI referred to the non-namespaced docbook-xsl,

+ ;; with its namespaced version using a URI differing in

+ ;; the path component as '…/xsl-ns/'.

+ ;; At some point the namespaced version was made the

+ ;; canonical docbook-xsl package whilst preserving the

+ ;; original URI.

+ ;;

+ ;; For compatibility with XML files that still specify

+ ;; the legacy namespaced docbook-xsl URIs we re-add them

+ ;; here.

+ (for-each

+ (lambda (type)

+ ;; Remap /xsl-ns/ to /xsl/.

+ ;; Note: URI resolutions are not recursive.

+ ;; A rewrite rule from:

+ ;; 'http://docbook.sourceforge.net/release/xsl-ns/'

+ ;; to

+ ;; 'http://docbook.sourceforge.net/release/xsl/'

+ ;; will not trigger the rewrite rule that ultimately

+ ;; remaps to a /gnu/store URI, as can be seen by

+ ;; invoking:

+ ;; $ xmlcatalog "" \

+ ;; 'http://docbook.sourceforge.net/release/xsl-ns/current/'

+ ;; http://docbook.sourceforge.net/release/xsl/current/

+ ;; $ xmlcatalog "" \

+ ;; 'http://docbook.sourceforge.net/release/xsl/current/'

+ ;; file://gnu/store/…/xml/xsl/…

+ ;;

+ ;; See XML Catalog specification, item 7.2.2. for

+ ;; details.

+ (invoke xmlcatalog "--noout"

+ "--add" type

+ "http://docbook.sourceforge.net/release/xsl-ns/current/"

+ store-uri

+ catalog))

+ (list "rewriteSystem" "rewriteURI")))

+++ b/gnu/packages/docbook.scm

+;; The fetch-plan, install-plan and phases for docbook-xml tend to vary

+;; between releases therefore we use a “template” package for the

+;; transformations that are common to these packages.

+(define* (docbook-xml-package source version)

+ "Return a package for a docbook-xml package version @var{version} and

+downloading from @var{source}, where @var{version} is a string and

+@var{source} is a @code{<origin>} record."

+ (version version)

+ (source source)

+ ;; These files do not need 0755 permission.

+ (xslt-file #$(local-file

+ (search-auxiliary-file

+ "xml/patch-catalog-xml.xsl")))

+ ;; Avoid profile conflicts by installing to a

+ ;; versioned path.

+ (dest-path

+ (format #f "~a/xml/docbook/~a" #$output #$version)))

+ (for-each

+ (lambda (catalog)

+ (let ((catalog* (string-append catalog ".new")))

+ (invoke xsltproc "--nonet" "--novalid" "--noout"

+ "--stringparam" "prefix" dest-path

+ "--output" catalog*

+ xslt-file catalog)

+ (rename-file catalog* catalog)))

+ (find-files "." "catalog\\.xml$"))))))))

+(define-public docbook-xml-5.1

+ (let* ((version "5.1")

+ (source (origin

+ (method url-fetch/zipbomb)

+ (uri (string-append "https://docbook.org/xml/" version

+ "/docbook-v" version "-os.zip"))

+ (sha256

+ (base32

+ "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk"))))

+ (template (docbook-xml-package source version)))

+ (package

+ (inherit template)

+ (arguments

+ (let ((dest-dir (format #f "xml/docbook/~a/" version)))

+ (substitute-keyword-arguments (package-arguments template)

+ ;; XXX: A default value must be provided otherwise this

+ ;; substitution has no effect.

+ ((#:install-plan _ #f)

+ #~`(("schemas/" #$dest-dir)))))))))

+;; XXX: docbook-xml-4.x versions use the same #:install-plan but since the

+;; paths are versioned we can't use (inherit …).

+(define* (docbook-xml-4.x-package source version)

+ "Return a template for a docbook-xml-4.x package version @var{version} and

+downloading from @var{source}, where @var{version} is a string and

+@var{source} is a @code{<origin>} record."

+ (let ((base-template (docbook-xml-package source version)))

+ (package

+ (inherit base-template)

+ (arguments

+ (let* ((dest-dir (format #f "xml/docbook/~a/" version)))

+ (substitute-keyword-arguments (package-arguments base-template)

+ ((#:phases phases)

+ ;; Some programs, such as kdoctools, instead of using

+ ;; XML_CATALOG_FILES, prefer to use cmake to locate

+ ;; the DTDs for docbook-xml-4.x packages but

+ ;; since there's no agreed standard as to where these files

+ ;; should be placed, in practice the .cmake files

+ ;; end up searching for paths that are distribution specific.

+ #~(modify-phases #$phases

+ (add-after 'install 'symlink-alternate-path

+ (lambda _

+ ;; kdoctools searches under xml/dtd/docbook/

+ ;; which is the convention used by Nix.

+ (mkdir-p (string-append #$output "/xml/dtd"))

+ (symlink (string-append #$output "/" #$dest-dir)

+ (string-append #$output "/xml/dtd/docbook"))))))

+ ((#:install-plan _ #f)

+ #~`(("./" #$dest-dir

+ #:exclude-regexp ("ChangeLog$"

+ "README$"

+ "docbook\\.cat$"

+ "\\.txt$"))))))))))

+

+ (let* ((version "4.5")

+ (source (origin

+ (method url-fetch/zipbomb)

+ (uri (string-append "https://docbook.org/xml/" version

+ "/docbook-xml-" version ".zip"))

+ (sha256

+ (base32

+ "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf")))))

+ (docbook-xml-4.x-package source version)))

+ (let* ((version "4.4")

+ (source (origin

+ (method url-fetch/zipbomb)

+ (uri (string-append "https://docbook.org/xml/" version

+ "/docbook-xml-" version ".zip"))

+ (sha256

+ (base32

+ "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82")))))

+ (docbook-xml-4.x-package source version)))

+ (let* ((version "4.3")

+ (source (origin

+ (method url-fetch/zipbomb)

+ (uri (string-append "https://docbook.org/xml/" version

+ "/docbook-xml-" version ".zip"))

+ (sha256

+ (base32

+ "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3")))))

+ (docbook-xml-4.x-package source version)))

+ (let* ((version "4.2")

+ (source (origin

+ (method url-fetch/zipbomb)

+ (uri (string-append "https://docbook.org/xml/" version

+ "/docbook-xml-" version ".zip"))

+ (sha256

+ (base32

+ "18hgwvmywh6a5jh38szjmg3hg2r4v5lb6r3ydc3rd8cp9wg61i5c")))))

+ (docbook-xml-4.x-package source version)))

+ (let* ((version "4.1.2")

+ (source (origin

+ (method url-fetch/zipbomb)

+ (uri (string-append "https://docbook.org/xml/" version

+ "/docbkx412.zip"))

+ (sha256

+ (base32

+ "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h"))))

+ (template (docbook-xml-4.x-package source version)))

+ (package

+ (inherit template)

+ (arguments

+ (substitute-keyword-arguments (package-arguments template)

+ ((#:phases phases)

+ #~(modify-phases #$phases

+ (add-after 'unpack 'copy-catalog-file

+ ;; docbook-xml-4.1.2 is unique in the fact that it doesn't come

+ ;; with a catalog.xml file, requiring it to be generated by hand

+ ;; from the docbook.cat SGML catalog. We could automatically

+ ;; generate it here at the cost of enlarging the package

+ ;; definition with a rudimentary (PEG) parser for the SGML

+ ;; catalog but this is overkill since this file is unlikely to

+ ;; change, therefore we ship a pre-generated catalog.xml.

+ (lambda _

+ (copy-file

+ #$(local-file

+ (search-auxiliary-file

+ "xml/docbook-xml/catalog-4.1.2.xml"))

+ "catalog.xml")))

+ (add-after 'patch-catalog-xml 'add-rewrite-entries

+ (lambda* (#:key inputs #:allow-other-keys)

+ (let ((xmlcatalog (search-input-file inputs

+ "/bin/xmlcatalog"))

+ (dtd-path (format #f "~a/xml/docbook/~a"

+ #$output #$version)))

+ (for-each

+ (lambda (type)

+ (invoke xmlcatalog "--noout"

+ "--add" type

+ "http://www.oasis-open.org/docbook/xml/4.1.2/"

+ (string-append "file://" dtd-path "/")

+ "catalog.xml"))

+ (list "rewriteSystem" "rewriteURI")))))))))

+ (native-inputs

+ (modify-inputs (package-native-inputs template)

+ (prepend libxml2))))))

+

+(define-public docbook-xml docbook-xml-5.1)

+++ b/gnu/packages/docbook.scm

+

+(define-public docbook-xml-5.0.1

+ (let* ((version "5.0.1")

+ (source (origin

+ (method url-fetch)

+ (uri (string-append "https://docbook.org/xml/" version

+ "/docbook-" version ".zip"))

+ (sha256

+ (base32

+ "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs"))))

+ (template (docbook-xml-package source version)))

+ (package

+ (inherit template)

+ (arguments

+ (let ((dest-dir (format #f "xml/docbook/~a/" version)))

+ (substitute-keyword-arguments (package-arguments template)

+ ((#:install-plan _ #f)

+ #~`(("catalog.xml" #$dest-dir)

+ ("docbook.nvdl" #$dest-dir)

+ ("dtd" #$dest-dir)

+ ("rng" #$dest-dir)

+ ("sch" #$dest-dir)

+ ("xsd" #$dest-dir)))))))))

+

+++ b/gnu/local.mk

+ %D%/packages/patches/docbook2x-filename-handling.patch \

+ %D%/packages/patches/docbook2x-manpage-typo.patch \

+ %D%/packages/patches/docbook2x-preprocessor-declaration.patch \

+ %D%/packages/patches/docbook2x-static-datadir-evaluation.patch \

+++ b/gnu/packages/docbook.scm

+ #:use-module (gnu packages autotools)

+ "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"))

+ (patches

+ (search-patches "docbook2x-filename-handling.patch"

+ "docbook2x-manpage-typo.patch"

+ "docbook2x-preprocessor-declaration.patch"

+ "docbook2x-static-datadir-evaluation.patch"))

+ (modules '((guix build utils)))

+ (snippet

+ ;; Fix a failing test (maybe it worked with old texinfo?)

+ #~(substitute* "test/complete-manuals/at1.xml"

+ (("<bridgehead>")

+ "<bridgehead renderas=\"sect2\">")))))

+ (add-after 'unpack 'autoreconf

+ (lambda _

+ (invoke "autoreconf" "-vif")))

+ (inputs

+ (list bash-minimal

+ perl

+ perl-xml-namespacesupport

+ perl-xml-parser

+ perl-xml-sax

+ perl-xml-sax-base

+ texinfo

+ libxslt))

+ (native-inputs

+ (list autoconf automake libtool

+ docbook-xml-4.5))

+++ b/gnu/packages/patches/docbook2x-filename-handling.patch

+## 03_fix_420153_filename_whitespace_handling.dpatch by

+## Daniel Leidert (dale) <daniel.leidert@wgdd.de>

+##

+## All lines beginning with `## DP:' are a description of the patch.

+## DP: Peter Eisentraut reported a regression in the whitespace handling of

+## DP: refentrytitle content during filename creation:

+## DP: http://bugs.debian.org/420153. The problem is, that upstream first

+## DP: replaces all spaces (but not linebreaks btw) with underlines and then

+## DP: it tries to normalize the result. This means, that a linebreak with

+## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'.

+## DP: So what we basically do in this patch is, that we first normalize the

+## DP: refentrytitle and then replace any spaces left with underlines.

+

+Edit by Bruno Victal <mirai@makinata.eu>:

+ Removed dpatch lines.

+

+--- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000 +0200

++++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000 +0200

+@@ -30,7 +30,7 @@

+

+ <xsl:template name="manpage-filename">

+ <xsl:param name="filename" />

+- <xsl:value-of select="normalize-space(translate($filename, &quot; /&quot;, &quot;__&quot;))" />

++ <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" />

+ </xsl:template>

+

+

+--- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000 +0200

++++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000 +0200

+@@ -38,7 +38,11 @@

+ <xsl:template name="refentry-filename">

+ <xsl:param name="title" />

+

+- <xsl:variable name="title2" select="translate($title, &quot; /&quot;, &quot;__&quot;)" />

++ <xsl:variable name="title2">

++ <xsl:call-template name="manpage-filename">

++ <xsl:with-param name="filename" select="$title" />

++ </xsl:call-template>

++ </xsl:variable>

+

+ <!-- not using gentext here since man page names tend not to have

+ accented chars / non-Latin chars ...

+++ b/gnu/packages/patches/docbook2x-manpage-typo.patch

+Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>

+

+--- docbook2x-0.8.8.orig/doc/docbook2man.1

++++ docbook2x-0.8.8/doc/docbook2man.1

+@@ -187,7 +187,7 @@ parameter instead.

+

+ However, inside a custom stylesheet

+ (\fInot on the command-line\fR)

+-this paramter can be set to the XPath expression

++this parameter can be set to the XPath expression

+ \*(T<document('')\*(T>,

+ which will cause the custom translations

+ directly embedded inside the custom stylesheet to be read.

+--- docbook2x-0.8.8.orig/doc/docbook2texi.1

++++ docbook2x-0.8.8/doc/docbook2texi.1

+@@ -230,7 +230,7 @@ parameter instead.

+

+ However, inside a custom stylesheet

+ (\fInot on the command-line\fR)

+-this paramter can be set to the XPath expression

++this parameter can be set to the XPath expression

+ \*(T<document('')\*(T>,

+ which will cause the custom translations

+ directly embedded inside the custom stylesheet to be read.

+++ b/gnu/packages/patches/docbook2x-preprocessor-declaration.patch

+## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson <cjwatson@debian.org>.

+##

+## All lines beginning with `## DP:' are a description of the patch.

+## DP: Conventionally, preprocessor declarations should start with

+## DP: '\"

+## DP: rather than

+## DP: .\"

+## DP: Current man-db only supports the first (and recommended) syntax. So

+## DP: Colin Watson provided this patch to fix docbook2x.

+## DP:

+## DP: <URL:http://bugs.debian.org/442782>

+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>

+

+Edit by Bruno Victal <mirai@makinata.eu>:

+ Removed dpatch lines.

+

+--- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200

++++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100

+@@ -342,6 +342,25 @@

+ $self->{line_start} = 1;

+ }

+

++#

++# Print a comment in the output, without causing a break.

++# Params: comment - the comment text.

++# May use any characters; they need not be escaped.

++#

++sub comment_nobreak

++{

++ my ($self, $comment) = @_;

++ $self->write("\n") unless $self->{line_start};

++

++ foreach my $line (split(/\n/, $comment)) {

++ $self->write('\'\" ');

++ $self->write($line);

++ $self->write("\n");

++ }

++

++ $self->{line_start} = 1;

++}

++

+

+ #

+ # Use a roff "escape" i.e. commands embedded in text starting with \

+@@ -510,16 +529,20 @@

+

+ $self->{'adjust-stack'} = [ 'b' ];

+

+- $self->{rw}->comment($elem->attr('preprocessors'))

+- if($elem->attr('preprocessors') ne '');

+-

++ my $preprocessors = $elem->attr('preprocessors');

+ # I've dug through the Internet to see if there was any

+ # standard way to specify encoding with man pages.

+ # The following seems to be a reasonable proposal:

+ # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html>

+ my $encoding = $self->{options}->{'encoding'};

+ $encoding =~ s#//TRANSLIT$##i;

+- $self->{rw}->comment("-*- coding: $encoding -*-");

++ $encoding = "-*- coding: $encoding -*-";

++ if ($preprocessors eq '') {

++ $preprocessors = $encoding;

++ } else {

++ $preprocessors = "$preprocessors $encoding";

++ }

++ $self->{rw}->comment_nobreak($preprocessors);

+

+ # Define escapes for switching to and from monospace fonts (groff only)

+ $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});

+--- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000 +0200

++++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +0100

+@@ -528,7 +528,7 @@

+ <exslt:document method="text"

+ encoding="{$encoding}"

+ href="{$path}">

+- <xsl:text>.\" -*- coding: </xsl:text>

++ <xsl:text>'\" -*- coding: </xsl:text>

+ <xsl:value-of select="$encoding" />

+ <xsl:text> -*-&#10;</xsl:text>

+ <xsl:copy-of select="$content" />

+@@ -538,7 +538,7 @@

+ <saxon:output method="text"

+ encoding="{$encoding}"

+ href="{$path}">

+- <xsl:text>.\" -*- coding: </xsl:text>

++ <xsl:text>'\" -*- coding: </xsl:text>

+ <xsl:value-of select="$encoding" />

+ <xsl:text> -*-&#10;</xsl:text>

+ <xsl:copy-of select="$content" />

+++ b/gnu/packages/patches/docbook2x-static-datadir-evaluation.patch

+Description:

+ 01_fix_static_datadir_evaluation.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>

+ All lines beginning with `## DP:' are a description of the patch.

+ The evaluation of datadir results in "${prefix}/share" without

+ evaluation of the ${prefix} variable with autoconf 2.60.

+

+Index: docbook2X-0.8.8/configure.ac

+===================================================================

+--- docbook2X-0.8.8.orig/configure.ac

++++ docbook2X-0.8.8/configure.ac

+@@ -148,7 +148,7 @@

+ dnl they will reside and should use these static_* values.

+ dnl Ensure that all static_* are fully expanded.

+

+-eval static_datadir="$datadir"

++eval eval static_datadir="$datadir"

+

+ eval static_bindir="$bindir"

+ old_val=""

+++ b/gnu/packages/docbook.scm

+ (add-after 'generate-catalog.xml 'patch-catalog.xml

+ ;; Note: URI resolutions are not recursive.

+ ;; A rewrite rule from:

+ ;; 'http://docbook.sourceforge.net/release/xsl-ns/'

+ ;; to

+ ;; 'http://docbook.sourceforge.net/release/xsl/'

+ ;; will not trigger the rewrite rule that ultimately

+ ;; remaps to a /gnu/store URI, as can be seen by

+ ;; invoking:

+ ;; $ xmlcatalog "" \

+ ;; 'http://docbook.sourceforge.net/release/xsl-ns/current/'

+ ;; http://docbook.sourceforge.net/release/xsl/current/

+ ;; $ xmlcatalog "" \

+ ;; 'http://docbook.sourceforge.net/release/xsl/current/'

+ ;; file://gnu/store/…/xml/xsl/…

+ ;;

+ ;; See XML Catalog specification, item 7.2.2. for

+ ;; details.

+ (catalog-file "xsl/catalog.xml")

+ ;; Remove /snapshot/ references.

+ (lambda (scheme)

+ (invoke xmlcatalog "--noout"

+ "--del"

+ (string-append

+ scheme

+ "://cdn.docbook.org/release/xsl/snapshot/")

+ catalog-file))

+ (list "http" "https"))

+ ;; Rewrite both http:// and https:// URIs.

+ (for-each

+ (lambda (path)

+ (lambda (scheme)

+ (for-each

+ (lambda (entry-type)

+ (let ((uri (string-append scheme "://" path)))

+ (invoke xmlcatalog "--noout"

+ "--add" entry-type uri store-uri

+ catalog-file)))

+ (list "rewriteSystem" "rewriteURI")))

+ (list "http" "https")))

+ (list #$(format #f "cdn.docbook.org/release/xsl/~a/"

+ base-version)

+ "cdn.docbook.org/release/xsl/current/"

+ ;; Re-add the no longer present compatibility entries for

+ ;; v.1.79.1 or earlier URIs.

+ "docbook.sourceforge.net/release/xsl/current/"

+ ;; Originally the

+ ;; "http://docbook.sourceforge.net/release/xsl/"

+ ;; URI referred to the non-namespaced docbook-xsl,

+ ;; with its namespaced version using a URI differing in

+ ;; the path component as '…/xsl-ns/'.

+ ;; At some point the namespaced version was made the

+ ;; canonical docbook-xsl package whilst preserving the

+ ;; original URI.

+ ;;

+ ;; For compatibility with XML files that still specify

+ ;; the legacy namespaced docbook-xsl URIs we re-add them

+ ;; here.

+ "docbook.sourceforge.net/release/xsl-ns/current/")))))

+++ b/gnu/local.mk

+++ b/gnu/packages/docbook.scm

+++ b/gnu/packages/moreutils.scm

+ docbook-xsl

+++ /dev/null

+++ /dev/null

+++ b/gnu/packages/docbook.scm

+ #:use-module (gnu packages groff)

+ #:use-module (gnu packages web)

+ (add-after 'install 'sgml-check

+ ;; This is not covered by 'make check'.

+ ;; Test that 'sgml2xml-isoent' works.

+ (lambda* (#:key tests? #:allow-other-keys)

+ (when tests?

+ (invoke "make" "installcheck"))))

+ opensp

+ tidy-html

+ ;; For tests

+ docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4

+ docbook-xml-4.5

+ groff-minimal libxml2))

+++ b/gnu/packages/xml.scm

+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>

+ (list

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'install 'use-other-outputs

+ (lambda _

+ (let ((doc (string-append #$output:doc "/share/"))

+ (static (string-append #$output:static "/lib/")))

+ (for-each mkdir-p (list doc static))

+

+ (rename-file (string-append #$output "/share/gtk-doc")

+ (string-append doc "/gtk-doc"))

+

+ (for-each

+ (lambda (ar)

+ (rename-file ar

+ (string-append static (basename ar))))

+ (find-files (string-append #$output "/lib") "\\.a$"))

+

+ ;; Remove reference to the static library from the .la

+ ;; file such that Libtool does the right thing when both

+ ;; the shared and static variants are available.

+ (substitute* (string-append #$output "/lib/libxml2.la")

+ (("^old_library='libxml2.a'") "old_library=''"))))))))

+++ b/gnu/packages/xml.scm

+ (native-search-paths

+ (list $SGML_CATALOG_FILES $XML_CATALOG_FILES))

+++ b/gnu/packages/docbook.scm

+ (add-after 'install 'split-outputs

+ (lambda _

+ (let* ((old (string-append #$output "/share/doc"))

+ (new (string-append #$output:doc "/share/doc")))

+ (mkdir-p (dirname new))

+ (rename-file old new))))

+ (outputs '("out" "doc"))

+++ b/gnu/local.mk

+ %D%/packages/patches/docbook-utils-documentation-edits.patch \

+ %D%/packages/patches/docbook-utils-escape-characters.patch \

+ %D%/packages/patches/docbook-utils-remove-jade-sp.patch \

+ %D%/packages/patches/docbook-utils-respect-refentry-for-name.patch \

+ %D%/packages/patches/docbook-utils-source-date-epoch.patch \

+ %D%/packages/patches/docbook-utils-use-date-element.patch \

+++ b/gnu/packages/docbook.scm

+ (patches

+ (search-patches "docbook-utils-documentation-edits.patch"

+ "docbook-utils-escape-characters.patch"

+ "docbook-utils-remove-jade-sp.patch"

+ "docbook-utils-respect-refentry-for-name.patch"

+ "docbook-utils-use-date-element.patch"

+ "docbook-utils-source-date-epoch.patch"))

+ (substitute* (find-files "." "\\.((in)|(am))$")

+ ((".*SGML_CATALOG_FILES=/etc/sgml/catalog.*") ""))

+ (arguments

+ (list

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'unpack 'autoreconf

+ (lambda _

+ (invoke "autoreconf" "-vif"))))))

+ (native-inputs (list autoconf automake libtool))

+++ b/gnu/packages/patches/docbook-utils-documentation-edits.patch

+Description: Fix some typos in man pages

+Author: Mathieu Malaterre <malat@debian.org>

+

+Index: docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1

+===================================================================

+--- docbook-utils-0.6.14.orig/doc/man/docbook2man-spec.pl.1 2012-05-09 18:39:17.932819095 +0200

++++ docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1 2012-05-09 18:39:24.780818845 +0200

+@@ -17,7 +17,7 @@

+ .SH "DESCRIPTION"

+ .PP

+ \fBdocbook2man\fR is a sgmlspl spec file that produced man

+-pages (using the -man macros) from DocBook RefEntry markup.

++pages (using the \-man macros) from DocBook RefEntry markup.

+ .PP

+ The program reads ESIS produced by nsgmls (or other SGML parsers) from

+ standard input. Markup not found in RefEntry is discarded.

+Index: docbook-utils-0.6.14/doc/man/frontend-spec.7

+===================================================================

+--- docbook-utils-0.6.14.orig/doc/man/frontend-spec.7 2012-05-09 18:41:45.172813778 +0200

++++ docbook-utils-0.6.14/doc/man/frontend-spec.7 2012-05-09 18:42:03.176813129 +0200

+@@ -10,7 +10,7 @@

+ .SH "DESCRIPTION"

+ .PP

+ \fBjw\fR(1) calls frontends like

+-\fIfrontends/docbook\fR to get the informations

++\fIfrontends/docbook\fR to get the information

+ specific to a given input format. The frontend knows which information

+ to return from the first command line parameter. It gets all necessary

+ data via environment variables ready to use.

+Index: docbook-utils-0.6.14/doc/man/jw.1

+===================================================================

+--- docbook-utils-0.6.14.orig/doc/man/jw.1 2012-05-09 18:39:35.612818456 +0200

++++ docbook-utils-0.6.14/doc/man/jw.1 2012-05-09 18:40:51.736815708 +0200

+@@ -142,7 +142,7 @@

+ The following options apply to the conversion script:

+ .TP

+ \fB -f \fIfrontend\fB | --frontend \fIfrontend\fB \fR

+-Allows to specify another frontend than default \fIdocbook\fR\&.

++Allows one to specify another frontend than default \fIdocbook\fR\&.

+ The list of currently available frontends is:

+ .RS

+ .TP

+@@ -156,13 +156,13 @@

+ .RE

+ .TP

+ \fB -b \fIbackend\fB | --backend \fIbackend\fB \fR

+-Allows to specify another backend than default

++Allows one to specify another backend than default

+ \fIHTML\fR\&. The list of currently available

+ backends is:

+ .RS

+ .TP

+ \fB\fIdvi\fB\fR

+-Converts to DVI (DeVice Independant

++Converts to DVI (DeVice Independent

+ files) by calling \fBJade\fR or

+ \fBOpenJade\fR\&.

+ .TP

+@@ -210,7 +210,7 @@

+ .RE

+ .TP

+ \fB -c \fIfile\fB | --cat \fIfile\fB \fR

+-Allows to use an extra SGML Open Catalog that will list

++Allows one to use an extra SGML Open Catalog that will list

+ other files like customization style sheets, adaptations to the

+ DocBook Document Type Definition, special character entities,

+ etc. This catalog is added to the list of catalogs determined

+@@ -241,7 +241,7 @@

+ are specified on the command line.

+ .TP

+ \fB -d \fIfile\fB|default|none | --dsl \fIfile\fB|default|none \fR

+-Allows to use a customized style sheet instead

++Allows one to use a customized style sheet instead

+ of the default one.

+

+ A "target" starting with a hash mark "#" can be appended

+Index: docbook-utils-0.6.14/doc/man/sgmldiff.1

+===================================================================

+--- docbook-utils-0.6.14.orig/doc/man/sgmldiff.1 2012-05-09 18:41:13.316814927 +0200

++++ docbook-utils-0.6.14/doc/man/sgmldiff.1 2012-05-09 18:41:38.032814038 +0200

+@@ -17,7 +17,7 @@

+

+ .SH "DESCRIPTION"

+ .PP

+-This perl script allows to determine the structural differences

++This perl script allows one to determine the structural differences

+ between two SGML files. It compares the files, regardless of what

+ is in between the tags, to only focus on the markup. Its output

+ is similar to \fBdiff\fR(1)\&.

+@@ -62,8 +62,8 @@

+ Lines 5 to 7 of the first file have been changed

+ into lines 8 to 10 of the second line.

+ In addition to those summaries, the lines of the first file are

+-shown preceeded by '<' and the lines of the second file are

+-shown preceeded by '>".

++shown preceded by '<' and the lines of the second file are

++shown preceded by '>".

+ .SH "OPTIONS"

+ .PP

+ Here is the list of actions that can be requested to

+++ b/gnu/packages/patches/docbook-utils-escape-characters.patch

+Description: incorrectly strips whitespace (patch included)

+ In the previous upload, docbook2man was patched to escape the special

+ characters . and ' at the beginning of a line (see #399947).

+ Unfortunately that patch was incorrect -- as well as escaping the special

+ characters, it also removes all whitespace from the beginning of

+ affected lines. As a result, if you are in a block where whitespace

+ matters (such as <screen>...</screen>) then the output is now incorrect.

+

+ This is very easy to fix -- just match the whitespace and preserve it,

+ instead of tossing it away. The full patch (just two lines) is included

+ below.

+Author: Ben Burton <bab@debian.org>

+Forwarded: not-needed

+Bug-Debian: http://bugs.debian.org/528334

+

+Edit by Bruno Victal <mirai@makinata.eu>:

+ Patch was edited so that it could be applied against the original

+ docbook-utils-0.6.14 sources.

+

+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl

+===================================================================

+--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:59:42.584774885 +0200

++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 19:00:34.788773002 +0200

+@@ -1212,8 +1212,8 @@

+ $_[0] =~ s/\\/\\\\/g;

+

+ # Escape dots and single quotes in column 1

+- $_[0] =~ s/^\./\\\&\./;

+- $_[0] =~ s/^\'/\\\&\'/;

++ $_[0] =~ s/^([ \t]*)\./$1\\\&\./;

++ $_[0] =~ s/^([ \t]*)\'/$1\\\&\'/;

+

+ # In non-'pre'-type elements:

+ if(!$nocollapse_whitespace) {

+++ b/gnu/packages/patches/docbook-utils-remove-jade-sp.patch

+Description: Change dependencies on jade and sp to openjade and opensp

+Author: Neil Roeth <neil@debian.org>

+Last-Update: 2016-07-24

+

+Edit by Bruno Victal <mirai@makinata.eu>:

+ Patch was edited so that it could be applied against the original

+ docbook-utils-0.6.14 sources.

+---

+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/

+--- a/doc/HTML/Makefile.am

++++ b/doc/HTML/Makefile.am

+@@ -1,4 +1,4 @@

+-htmldir = $(docdir)/html/docbook-utils-@VERSION@

++htmldir = $(docdir)/html

+ html_DATA = api.html \

+ backend-spec.html \

+ docbook2man.html \

+@@ -25,6 +25,6 @@

+ $(top_srcdir)/doc/refentry/sgmldiff.sgml

+ SGML_CATALOG_FILES=/etc/sgml/catalog \

+ SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \

+- jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \

++ openjade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \

+ -V '%use-id-as-filename%' $<

+

+--- a/doc/man/Makefile.am

++++ b/doc/man/Makefile.am

+@@ -12,5 +12,5 @@

+ $(top_srcdir)/helpers/docbook2man-spec.pl

+ SGML_CATALOG_FILES=/etc/sgml/catalog \

+ SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \

+- nsgmls $< | \

++ onsgmls $< | \

+ sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl

+--- a/backends/man.in

++++ b/backends/man.in

+@@ -7,8 +7,8 @@

+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \

+ { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}

+ trap 'rm -rf "${TMPDIR}"' EXIT

+-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"

+-sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"

++onsgmls $SGML_FILE > "${TMPDIR}/onsgmls.tmp"

++sgmlspl $HELPER <"${TMPDIR}/onsgmls.tmp" 2>"${TMPDIR}/errs"

+ if [ $? -ne 0 ]

+ then

+ cat "${TMPDIR}/errs"

+@@ -18,7 +18,7 @@

+ if grep unresolved "${TMPDIR}/errs" >/dev/null 2>&1

+ then

+ echo "Resolving references.."

+- sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp"

++ sgmlspl $HELPER <"${TMPDIR}/onsgmls.tmp"

+ if [ $? -ne 0 ]

+ then exit 1

+ fi

+--- a/backends/texi.in

++++ b/backends/texi.in

+@@ -3,7 +3,7 @@

+ # This program is under GPL license. See LICENSE file for details.

+

+ # Convert to texinfo

+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi

++onsgmls $SGML_FILE | sgmlspl docbook2texi-spec.pl >$SGML_FILE_NAME.texi

+ if [ $? -ne 0 ]

+ then exit 1

+ fi

+--- a/bin/sgmldiff.in

++++ b/bin/sgmldiff.in

+@@ -22,13 +22,13 @@

+

+ use strict;

+ use integer;

+-use vars qw($nsgmls $errors $errorlog $VERSION);

++use vars qw($onsgmls $errors $errorlog $VERSION);

+ use Getopt::Long 2.01;

+

+ $VERSION = 1.03;

+

+-my $nsgmls;

+-$nsgmls = "@jade_bindir@/nsgmls";

++my $onsgmls;

++$onsgmls = "@jade_bindir@/onsgmls";

+

+ #----------------------------------------------------------------------

+ # TODO:

+@@ -37,7 +37,7 @@

+ # - Wait for suggestions ;-)

+ #

+ # Note: the input file need not be valid, nor is it necessary to have

+-# the DTDs. nsgmls always returns a structure.

++# the DTDs. onsgmls always returns a structure.

+ #----------------------------------------------------------------------

+

+ # Get file name

+@@ -141,11 +141,11 @@

+ unlink $diff2;

+

+ #---------------------------------------------------------------------

+-# Process nsgmls output: keep all stuff that is important for the

++# Process onsgmls output: keep all stuff that is important for the

+ # structure comparison. Make two structures: one that is diffed

+ # (without text) (DIFF) and one that is used to present the

+ # differences to the user (@full). For more info: see SP

+-# documentation, nsgmls output format.

++# documentation, onsgmls output format.

+

+ sub prepare {

+ my($filename,$todiffname) = @_;

+@@ -161,7 +161,7 @@

+ my @line_numbered = ();

+ my $line = 0;

+

+- open(ESIS, "$nsgmls -l $errors $errorlog -onotation-sysid -oid -oempty $filename | "); #-oentity generates strange output; ? -ononsgml

++ open(ESIS, "$onsgmls -l $errors $errorlog -onotation-sysid -oid -oempty $filename | "); #-oentity generates strange output; ? -ononsgml

+ open(DIFF, "> $todiffname");

+ while (<ESIS>) {

+ chomp $_;

+@@ -375,7 +375,7 @@

+ };

+

+ #----------------------------------------------------------------------

+-# Normalise data text from nsgmls (i.e. don't print the escaped text).

++# Normalise data text from onsgmls (i.e. don't print the escaped text).

+ sub normalise_text {

+ my($string,$prefix) = @_;

+ my $result = "$prefix";

+--- a/configure.in

++++ b/configure.in

+@@ -21,7 +21,7 @@

+

+ dnl Checks for programs.

+ jade_bindirs="/usr/bin /usr/local/bin"

+-AC_FIND_PROGRAM(nsgmls, $jade_bindirs, jade_bindir)

++AC_FIND_PROGRAM(onsgmls, $jade_bindirs, jade_bindir)

+ AC_SUBST(jade_bindir)

+

+ perl_bindirs="/usr/bin /usr/local/bin"

+--- a/doc/refentry/docbook2man-spec.pl.sgml

++++ b/doc/refentry/docbook2man-spec.pl.sgml

+@@ -19,7 +19,7 @@

+ <!-- docbook2man-spec.pl BREAKAGE HERE! -->

+

+ <CmdSynopsis>

+-<Command>nsgmls</command>

++<Command>onsgmls</command>

+ <Arg><Replaceable>sgml document</replaceable></Arg>

+ <Command>| sgmlspl</command>

+ <Arg choice=req>docbook2man-spec.pl</arg>

+@@ -35,7 +35,7 @@

+ </Para>

+

+ <Para>

+-The program reads ESIS produced by nsgmls (or other SGML parsers) from

++The program reads ESIS produced by onsgmls (or other SGML parsers) from

+ standard input. Markup not found in RefEntry is discarded.

+ </Para>

+

+--- a/doc/refentry/docbook2texi-spec.pl.sgml

++++ b/doc/refentry/docbook2texi-spec.pl.sgml

+@@ -20,7 +20,7 @@

+ <!-- docbook2man-spec.pl BREAKAGE HERE! -->

+

+ <CmdSynopsis>

+-<Command>nsgmls</command>

++<Command>onsgmls</command>

+ <Arg><Replaceable>sgml document</replaceable></Arg>

+ <Command>| sgmlspl</command>

+ <Arg choice=req>docbook2texi-spec.pl</arg>

+@@ -37,7 +37,7 @@

+ </Para>

+

+ <Para>

+-The program reads ESIS produced by nsgmls (or other SGML parsers) from

++The program reads ESIS produced by onsgmls (or other SGML parsers) from

+ standard input. Currently the document element must be <SGMLTag>Book</sgmltag>,

+ otherwise the results are undefined.

+ </Para>

+--- a/doc/refentry/jw.sgml

++++ b/doc/refentry/jw.sgml

+@@ -630,7 +630,7 @@

+ <manvolnum>1</manvolnum></citerefentry>,

+ <citerefentry><refentrytitle>install-catalog</refentrytitle>

+ <manvolnum>8</manvolnum></citerefentry>,

+- <citerefentry><refentrytitle>nsgmls</refentrytitle>

++ <citerefentry><refentrytitle>onsgmls</refentrytitle>

+ <manvolnum>1</manvolnum></citerefentry>, <ulink

+ url="http://sources.redhat.com/docbook-tools/">docbook-utils

+ homepage</ulink>.</para>

+--- a/doc/refentry/sgmldiff.sgml

++++ b/doc/refentry/sgmldiff.sgml

+@@ -238,10 +238,10 @@

+ <glossterm>

+ <!-- Next line is a hack to force a paragraph break in the man-page. -->

+ <cmdsynopsis> <command></command> </cmdsynopsis>

+- <citerefentry> <refentrytitle>nsgmls</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>

++ <citerefentry> <refentrytitle>onsgmls</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>

+ </glossterm>

+ <glossdef>

+- <para>a base component of <application>Jade</application> DSSSL engine</para>

++ <para>a base component of <application>OpenJade</application> DSSSL engine</para>

+ </glossdef>

+ </glossentry>

+

+--- a/helpers/docbook2man-spec.pl

++++ b/helpers/docbook2man-spec.pl

+@@ -7,7 +7,7 @@

+ The SGMLSpm package from CPAN. This contains the sgmlspl script which

+ is used to grok this file. Use it like this:

+

+-nsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl

++onsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl

+

+ =head1 DESCRIPTION

+

+++ b/gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch

+Description: docbook2man should translate the NAME section according to the REFENTRY's lang attribute

+ Currently, docbook2man translates the NAME section according to the lang

+ attribute provided to the REFNAMEDIV tag.

+ When a lang attribute is specified in the REFENTRY tag and no lang

+ attribute is specified with the REFNAMEDIV, the lang attribute of the

+ REFENTRY should be used.

+Author: Nicolas François <nicolas.francois@centraliens.net>

+Forwarded: not-needed

+Bug-Debian: http://bugs.debian.org/394511

+

+Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl

+==============

+++ b/doc/guix.texi

+@c This is defined at (guix search-paths) as $XML_CATALOG_FILES.

+(search-path-specification

+ (variable "XML_CATALOG_FILES")

+ (separator " ")

+ (files '("xml"))

+ (file-pattern "^catalog\\.xml$")

+ (file-type 'regular))

+In the @env{XML_CATALOG_FILES} example above, we would match regular

+files; in the Python example, we would match directories.

+Again, the @env{XML_CATALOG_FILES} example shows a situation where this

+is needed.

+++ b/gnu/packages/perl.scm

+ (list $XML_CATALOG_FILES))

+++ b/gnu/packages/xml.scm

+ #:use-module (guix search-paths)

+ (native-search-paths (list $XML_CATALOG_FILES))

+ (native-search-paths (list $SGML_CATALOG_FILES))

+++ b/guix/search-paths.scm

+ $SGML_CATALOG_FILES

+ $XML_CATALOG_FILES

+;; Some packages (notably libxml2) make use of 'XML_CATALOG_FILES'

+;; and 'SGML_CATALOG_FILES' for remapping URI references or public/system

+;; identifiers to other URI references.

+(define $SGML_CATALOG_FILES

+ ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found

+ ;; under the 'sgml' sub-directory of any given package.

+ (search-path-specification

+ (variable "SGML_CATALOG_FILES")

+ (separator ":")

+ (files '("sgml"))

+ (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$")

+ (file-type 'regular)))

+

+(define $XML_CATALOG_FILES

+ ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml'

+ ;; sub-directory of any given package.

+ (search-path-specification

+ (variable "XML_CATALOG_FILES")

+ (separator " ")

+ (files '("xml"))

+ (file-pattern "^catalog\\.xml$")

+ (file-type 'regular)))

+

+++ b/gnu/packages/docbook.scm

+ #:use-module (guix search-paths)

+ "perl-xml-sax-base"))))

+ `("PERL5LIB" ":" prefix ,perl5lib)))

+ (native-search-paths (list $XML_CATALOG_FILES $SGML_CATALOG_FILES))

+++ b/gnu/packages/docbook.scm

+(define-public docbook-mathml-1.0

+ (package

+ (name "docbook-mathml")

+ (version "1.0")

+ (source (origin

+ (method url-fetch)

+ (uri

+ (string-append "https://www.oasis-open.org/docbook/xml/mathml/"

+ version "/dbmathml.dtd"))

+ (sha256

+ (base32

+ "10vmyl29j829w4xn928rznh163pf47gyzbbjjwqrbg2bidfnk7vp"))))

+ (build-system copy-build-system)

+ (arguments

+ (let ((target (format #f "xml/docbook/mathml/~a/" version)))

+ (list

+ #:modules '((guix build copy-build-system)

+ (guix build utils)

+ (sxml simple)

+ (srfi srfi-1))

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-before 'install 'generate-catalog.xml

+ (lambda _

+ (let ((store-uri (string-append "file://"

+ #$output "/"

+ #$target "dbmathml.dtd")))

+ (call-with-output-file "catalog.xml"

+ (lambda (port)

+ (sxml->xml

+ `(*TOP*

+ (*PI* xml "version='1.0'")

+ (catalog (@ (xmlns "urn:oasis:names:tc:entity:xmlns:xml:catalog"))

+ (public (@ (publicId "-//OASIS//DTD DocBook MathML Module V1.0//EN")

+ (uri ,store-uri)))

+ ,@(map

+ (lambda (scheme)

+ `(system

+ (@ (systemId

+ ,(string-append scheme

+ "://www.oasis-open.org/docbook/xml/"

+ "mathml/1.0/dbmathml.dtd"))

+ (uri ,store-uri))))

+ '("http" "https"))))

+ port)))))))

+ #:install-plan

+ #~`(("catalog.xml" #$target)

+ ("dbmathml.dtd" #$target)))))

+ (propagated-inputs

+ ;; These must be propagated for the package to make sense.

+ ;; TODO: Package MathML2 DTD and propagate it as well.

+ (list docbook-xml-4.1.2))

+ (home-page

+ "https://www.oasis-open.org/docbook/xml/mathml/1.0/index.1.shtml")

+ (synopsis "MathML support for DocBook XML V4.1.2.")

+ (description "The DocBook MathML Module is an extension to DocBook XML

+V4.1.2 that adds support for MathML in equation markup.")

+ (license (license:non-copyleft "" "See file headers."))))

+

+++ b/gnu/packages/perl.scm

+ (package-native-search-paths libxslt))

+++ b/gnu/packages/xml.scm

+ (native-search-paths

+ (list $SGML_CATALOG_FILES $XML_CATALOG_FILES))

+ (search-paths native-search-paths)

+++ b/gnu/packages/gnome.scm

+++ b/gnu/packages/music.scm

+ dblatex/stable

+++ b/gnu/packages/docbook.scm

+ "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk"))

+ (modules '((guix build utils)))

+ (snippet

+ ;; The .zip release mistakenly uses '5.1CR4' instead of

+ ;; '5.1' as intended by <https://docbook.org/xml/5.1/catalog.xml>.

+ #~(substitute* "schemas/catalog.xml"

+ (("5\\.1CR4") #$version)))))

+++ b/gnu/packages/xdisorg.scm

+ (rename-file old new))))

+ (add-after 'install 'symlink-pc

+ ;; in Requires.private of xkbregistry.pc

+ ;; XXX: Symlink libxml-2.0.pc in order to avoid putting

+ ;; libxml2 as a propagated input.

+ (lambda _

+ (let ((stem "/lib/pkgconfig/libxml-2.0.pc"))

+ (symlink (string-append #$(this-package-input "libxml2") stem)

+ (string-append #$output stem))))))))

+++ b/gnu/packages/docbook.scm

+ (add-after 'install 'split-outputs

+ (lambda _

+ (let ((old (string-append #$output "/share/doc"))

+ (new (string-append #$output:doc "/share/doc")))

+ (mkdir-p (dirname new))

+ (rename-file old new))))

+ (outputs '("out" "doc"))

+++ b/gnu/packages/docbook.scm

+++ b/gnu/packages/gnome.scm

+++ b/gnu/packages/docbook.scm

+ ;; lib/dbtexmf/xslt/4xslt.py shows that this package

+ ;; makes use of XML_CATALOG_FILES.

+ ;; It also invokes xsltproc, that already has it

+ ;; in its native-search-path so we don't need to

+ ;; reinclude it.

+ (native-search-paths (package-native-search-paths libxslt))

+++ b/gnu/local.mk

+ %D%/packages/patches/dbacl-icheck-multiple-definitions.patch \

+ %D%/packages/patches/dblatex-inkscape-1.0.patch \

+++ b/gnu/packages/docbook.scm

+ #:use-module (guix build-system python)

+ #:use-module (srfi srfi-26))

+ "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"))

+ (patches

+ (search-patches "dblatex-inkscape-1.0.patch"))))

+ (add-after 'wrap 'wrap-dblatex

+ (let ((path

+ (search-path-as-list

+ '("bin")

+ '#$(map (cut this-package-input <>)

+ (list "libxslt" "imagemagick" "inkscape"

+ "texlive-bin")))))

+ `("PATH" ":" prefix ,path)

+ `("GUIX_TEXMF" prefix (,(getenv "GUIX_TEXMF")))))))

+ (add-after 'check 'check-wrap

+ (lambda* (#:key tests? #:allow-other-keys)

+ (when tests?

+ (unsetenv "GUIX_TEXMF")

+ (invoke/quiet (string-append #$output "/bin/dblatex")

+ "--quiet" "tests/mathml/mmltest2.xml")))))))

+ (native-inputs (list docbook-mathml-1.0))

+ (list texlive-bin

+ (texlive-updmap.cfg (list texlive-amsmath

+ texlive-anysize

+ texlive-appendix

+ texlive-auxhook

+ texlive-bigintcalc

+ texlive-bin

+ texlive-bitset

+ texlive-bookmark

+ texlive-changebar

+ texlive-colortbl

+ texlive-courier

+ texlive-eepic

+ texlive-epstopdf-pkg

+ texlive-eso-pic

+ texlive-etexcmds

+ texlive-fancybox

+ texlive-fancyhdr

+ texlive-fancyvrb

+ texlive-float

+ texlive-footmisc

+ texlive-gettitlestring

+ texlive-graphics

+ texlive-graphics-cfg

+ texlive-helvetic

+ texlive-hycolor

+ texlive-hyperref

+ texlive-infwarerr

+ texlive-intcalc

+ texlive-jknapltx

+ texlive-kpathsea

+ texlive-kvdefinekeys

+ texlive-kvoptions

+ texlive-kvsetkeys

+ texlive-l3backend

+ texlive-latex

+ texlive-latex-bin

+ texlive-letltxmacro

+ texlive-listings

+ texlive-ltxcmds

+ texlive-multirow

+ texlive-overpic

+ texlive-pdfescape

+ texlive-pdflscape

+ texlive-pdfpages

+ texlive-pdftexcmds

+ texlive-psnfss

+ texlive-refcount

+ texlive-rerunfilecheck

+ texlive-rsfs

+ texlive-stmaryrd

+ texlive-subfigure

+ texlive-symbol

+ texlive-times

+ texlive-titlesec

+ texlive-tools

+ texlive-uniquecounter

+ texlive-url

+ texlive-wasysym

+ texlive-zapfding))

+ inkscape ;for svg conversion

+ (replace "imagemagick" imagemagick/stable)

+ (replace "inkscape" inkscape/stable))))))

+++ b/gnu/packages/patches/dblatex-inkscape-1.0.patch

+# Imported from <https://sourceforge.net/p/dblatex/dblatex/merge-requests/4/>

+

+# HG changeset patch

+# User Jan Tojnar <jtojnar@gmail.com>

+# Date 1588714251 -7200

+# Tue May 05 23:30:51 2020 +0200

+# Branch inkscape1

+# Node ID 611cc4a4a878d57f5877f2d418864560f68d25cf

+# Parent 3ddf5d6cedcbc9c8b98c4da77fd545b2478d90a3

+Port to Inkscape 1.0

+

+Inkscape revamped the CLI flags:

+

+https://gitlab.com/inkscape/inbox/issues/2416

+

+diff -r 3ddf5d6cedcb -r 611cc4a4a878 docs/custom/dblatex.xconf

+--- a/docs/custom/dblatex.xconf Tue Sep 10 00:40:26 2019 +0200

++++ b/docs/custom/dblatex.xconf Tue May 05 23:30:51 2020 +0200

+@@ -18,7 +18,7 @@

+ <imagedata>

+ <converter src="svg" dst="*" docformat="pdf">

+ <command>

+- inkscape -z -D --export-dpi=600 --export-%(dst)s=%(output)s %(input)s

++ inkscape -D --export-dpi=600 --export-type=%(dst)s --export-filename=%(output)s %(input)s

+ </command>

+ </converter>

+ </imagedata>

+diff -r 3ddf5d6cedcb -r 611cc4a4a878 lib/dbtexmf/core/imagedata.py

+--- a/lib/dbtexmf/core/imagedata.py Tue Sep 10 00:40:26 2019 +0200

++++ b/lib/dbtexmf/core/imagedata.py Tue May 05 23:30:51 2020 +0200

+@@ -178,7 +178,7 @@

+ class SvgConverter(ImageConverter):

+ def __init__(self, imgsrc, imgdst="", docformat="", backend=""):

+ ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)

+- self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",

++ self.add_command(["inkscape", "-D", "--export-type=%(dst)s", "--export-filename=%(output)s",

+ "%(input)s"])

+

+

+++ b/gnu/packages/freedesktop.scm

+++ b/gnu/packages/sssd.scm

+ "/manpages/docbook.xsl"))

+ docbook-xml-4.4

+++ b/gnu/packages/version-control.scm

+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>

+ (list docbook-xml-4.2 docbook-xsl libxslt))

+ (list

+ #:tests? #f ; No tests.

+ #:make-flags

+ #~(list

+ "ENABLE_MAN=yes"

+ ;; Add flag to work around OpenSSL 3 incompatibility.

+ ;; See <https://github.com/AGWA/git-crypt/issues/232>.

+ "CXXFLAGS+=-DOPENSSL_API_COMPAT=0x30000000L"

+ (string-append "PREFIX=" #$output))

+ #:phases

+ #~(modify-phases %standard-phases

+ (delete 'configure))))

+++ b/gnu/packages/gnome.scm

+ (add-after 'install 'split-outputs

+ (lambda _

+ (let* ((old (string-append #$output "/share/gtk-doc"))

+ (new (string-append #$output:doc "/share/gtk-doc")))

+ (mkdir-p (dirname new))

+ (rename-file old new)))))))

+ (outputs '("out" "doc"))

+++ b/gnu/packages/xml.scm

+ (list

+ #:configure-flags

+ #~(list (string-append "GETOPT="

+ #$(this-package-input "util-linux")

+ "/bin/getopt"))))

+++ b/gnu/packages/gtk.scm

+++ b/gnu/packages/music.scm

+ `(#:tests? #f)) ; no test target

+++ b/gnu/packages/linux.scm

+ (list

+ #:configure-flags

+ #~(list

+ ;; The udev rule is responsible for restoring the volume.

+ (string-append "--with-udev-rules-dir=" #$output "/lib/udev/rules.d"))

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-before 'install 'pre-install

+ (lambda _

+ ;; Don't try to mkdir /var/lib/alsa.

+ (substitute* "Makefile"

+ (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*")

+ "true\n")))))))

+++ b/gnu/packages/xml.scm

+ (native-search-paths

+ ;; For finding XML/SGML catalogs used by 'xsltproc' and 'xmllint'.

+ (package-native-search-paths libxslt))

+++ b/gnu/packages/image-processing.scm

+ ("docbook-xml" ,docbook-xml-4.2)

+++ b/gnu/packages/gtk.scm

+ #:use-module (guix search-paths)

+ (native-search-paths

+ ;; xsltproc's search paths, to avoid propagating libxslt.

+ ;; XXX: There's a module cycle as (gnu packages xml) imports

+ ;; (gnu packages gtk) so we can't use (package-native-search-paths …)

+ ;; and must duplicate it here instead.

+ (list $SGML_CATALOG_FILES $XML_CATALOG_FILES))

+++ b/gnu/local.mk

+ %D%/packages/patches/libsepol-versioned-docbook.patch \

+++ b/gnu/packages/patches/libsepol-versioned-docbook.patch

+# Sent upstream: <https://lore.kernel.org/selinux/260cd39c55ff2d13f5ac916b508f023bedecfce9.1692025627.git.mirai@makinata.eu/>

+

+From 260cd39c55ff2d13f5ac916b508f023bedecfce9 Mon Sep 17 00:00:00 2001

+Message-Id: <260cd39c55ff2d13f5ac916b508f023bedecfce9.1692827278.git.mirai@makinata.eu>

+From: Bruno Victal <mirai@makinata.eu>

+Date: Mon, 14 Aug 2023 15:51:05 +0100

+Subject: [PATCH] secilc: Use versioned DocBook public identifier.

+

+Fix xml validation issues that often crop up since the XML catalogs

+for DocBook often only contain versioned public identifiers.

+

+Signed-off-by: Bruno Victal <mirai@makinata.eu>

+---

+ secilc/secil2conf.8.xml | 2 +-

+ secilc/secil2tree.8.xml | 2 +-

+ secilc/secilc.8.xml | 2 +-

+ 3 files changed, 3 insertions(+), 3 deletions(-)

+

+diff --git a/secilc/secil2conf.8.xml b/secilc/secil2conf.8.xml

+index 33646f97..330b6a07 100644

+--- a/secilc/secil2conf.8.xml

++++ b/secilc/secil2conf.8.xml

+@@ -1,5 +1,5 @@

+ <?xml version="1.0" encoding="UTF-8"?>

+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"

++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">

+

+ <refentry>

+diff --git a/secilc/secil2tree.8.xml b/secilc/secil2tree.8.xml

+index e95a8947..d7bb177e 100644

+--- a/secilc/secil2tree.8.xml

++++ b/secilc/secil2tree.8.xml

+@@ -1,5 +1,5 @@

+ <?xml version="1.0" encoding="UTF-8"?>

+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"

++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">

+

+ <refentry>

+diff --git a/secilc/secilc.8.xml b/secilc/secilc.8.xml

+index e9a121e2..5c0680a8 100644

+--- a/secilc/secilc.8.xml

++++ b/secilc/secilc.8.xml

+@@ -1,5 +1,5 @@

+ <?xml version="1.0" encoding="UTF-8"?>

+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"

++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">

+

+ <refentry>

+

+base-commit: f6dc6acfa00707ce25c6357169111937f12512dd

+--

+2.40.1

+

+++ b/gnu/packages/selinux.scm

+ "1lcmgmfr0q7g5cwg6b7jm6ncw8cw6c1jblkm93v1g37bfhcgrqc0"))

+ (patches (search-patches "libsepol-versioned-docbook.patch"))))

+ (list docbook-xml-4.2 docbook-xsl xmlto))

+++ b/gnu/packages/freedesktop.scm

+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>

+ (list docbook-xsl docbook-xml-4.1.2

+ libxslt xmlto w3m-for-tests))

+ (guix build gnu-build-system)

+ (guix build utils))

+++ b/gnu/packages/freedesktop.scm

+ (list docbook-xml-4.3 ; to build the manpages

+ docbook-xsl

+ `(,glib "bin") ; for glib-mkenums

+ gnome-common ; TODO: Why is this needed?

+ gobject-introspection

+ gtk-doc/stable

+ intltool

+ pkg-config

+ libxslt))

+ (list

+ #:tests? #f ; requiring system message dbus

+ #:disallowed-references '("doc") ;enforce separation of "doc"

+ #:configure-flags

+ #~(list "--enable-man"

+ "--enable-available-modules" ; Such as lvm2, btrfs, etc.

+ "--localstatedir=/var"

+ "--enable-fhs-media" ;mount devices in /media, not /run/media

+ (string-append "--with-html-dir=" #$output:doc

+ "/share/doc/udisks/html")

+ (string-append "--with-udevdir=" #$output "/lib/udev"))

+ #:make-flags

+ #~(let* ((docbook-xsl-name-version

+ #$(string-append (package-name docbook-xsl) "-"

+ (package-version docbook-xsl)))

+ (docbook-xsl-catalog-file

+ (string-append #$(this-package-native-input "docbook-xsl")

+ "/xml/xsl/" docbook-xsl-name-version

+ "/catalog.xml"))

+ (docbook-xml-catalog-file

+ #$(file-append (this-package-native-input "docbook-xml")

+ "/xml/dtd/docbook/catalog.xml")))

+ ;; Reference the catalog files required to build the manpages.

+ (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file

+ " " docbook-xml-catalog-file)))

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-before 'configure 'fix-girdir

+ (lambda _

+ ;; Install introspection data to its own output.

+ (substitute* "udisks/Makefile.in"

+ (("girdir = .*")

+ "girdir = $(datadir)/gir-1.0\n")

+ (("typelibsdir = .*")

+ "typelibsdir = $(libdir)/girepository-1.0\n"))))

+ (add-after 'install 'wrap-udisksd

+ (lambda _

+ ;; Tell 'udisksd' where to find the 'mount' command.

+ (let ((utils #$(this-package-input "util-linux"))

+ (cryptsetup #$(this-package-input "cryptsetup"))

+ (parted #$(this-package-input "parted")))

+ (wrap-program (string-append #$output "/libexec/udisks2/udisksd")

+ `("PATH" ":" prefix

+ (,(string-append utils "/bin") ;for 'mount'

+ ;; cryptsetup is required for setting encrypted

+ ;; partitions, e.g. in gnome-disks

+ ,(string-append cryptsetup "/sbin")

+ "/run/current-system/profile/bin"

+ "/run/current-system/profile/sbin")))))))))

+++ b/gnu/packages/freedesktop.scm

+ (arguments

+ (list

+ #:tests? #f ;require the colord system service

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'install 'split-package

+ (lambda _

+ (let* ((old (string-append #$output "/share/gtk-doc"))

+ (new (string-append #$output:doc "/share/gtk-doc")))

+ (mkdir-p (dirname new))

+ (rename-file old new)))))))

+ (list docbook-xsl

+ gettext-minimal

+ gtk-doc/stable

+ libxslt

+ (outputs (list "out" "doc"))

+++ b/gnu/packages/freedesktop.scm

+ (list gettext-minimal

+ docbook-xsl

+ docbook-xml-4.3

+ libxslt))

+++ b/gnu/packages/virtualization.scm

+++ b/gnu/packages/gnome.scm

+ '("-Delogind=true"

+ (list docbook-xml-4.1.2

+++ b/gnu/packages/databases.scm

+ (list docbook-xsl

+ libxslt

+++ b/gnu/packages/networking.scm

+ ;; TODO: Requires docbook-to-man (unrelated to docbook2x and

+ ;; docbook-utils) to generate man page from SGML.

+++ b/gnu/packages/bioinformatics.scm

+ #:use-module (gnu packages docbook)

+ #$output:doc "/share/doc/" #$name))))

+ (native-inputs (list docbook-xsl doxygen graphviz libxslt))

+++ b/gnu/packages/version-control.scm

+ ("docbook-xml" ,docbook-xml-4.5)

+++ b/gnu/packages/music.scm

+ `(#:tests? #f)) ; no test target

+ docbook-xml-4.4 docbook-xsl qttools-5 pkg-config))

+++ b/gnu/packages/gnome.scm

+++ b/gnu/packages/rpm.scm

+ gtk-doc/stable

+++ b/gnu/packages/security-token.scm

+ gtk-doc/stable

+ eudev))

+++ b/gnu/packages/image-processing.scm

+ (arguments

+ (list

+ #:tests? #f ; No tests.

+ #:make-flags

+ #~(list

+ (string-append "PREFIX=" #$output)

+ (format #f "MANPAGE_XSL=~a/xml/xsl/~a-~a/manpages/docbook.xsl"

+ #$(this-package-native-input "docbook-xsl")

+ #$(package-name

+ (this-package-native-input "docbook-xsl"))

+ #$(package-version

+ (this-package-native-input "docbook-xsl"))))

+ #:phases

+ #~(modify-phases %standard-phases

+ (delete 'configure)

+ (add-before 'install 'fix-directory-creation

+ (lambda _

+ (mkdir-p (string-append #$output "/share/man/man1")))))))

+ (list giflib libjpeg-turbo libpng

+ perl))

+ (list docbook-xml-4.2 docbook-xsl

+ libxslt pkg-config))

+++ b/gnu/packages/xdisorg.scm

+ (list

+ #:configure-flags

+ #~(list (string-append "-Dxkb-config-root="

+ (search-input-directory

+ %build-inputs "share/X11/xkb"))

+ (string-append "-Dx-locale-root="

+ (search-input-directory

+ %build-inputs "share/X11/locale")))

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'install 'split-outputs

+ (lambda _

+ (let ((old (string-append #$output "/share/doc"))

+ (new (string-append #$output:doc "/share/doc")))

+ (mkdir-p (dirname new))

+ (rename-file old new)))))))

+ (outputs '("out" "doc"))

+++ b/gnu/packages/linux.scm

+ '(#:configure-flags (list ;; The udev rule is responsible for restoring

+ (list docbook-xml-4.2 docbook-xsl xmlto

+ gettext-minimal))

+ (list libsamplerate ncurses alsa-lib))

+++ b/gnu/packages/gtk.scm

+ (list

+ #:parallel-tests? #f

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-after 'unpack 'patch-gtk-doc-scan

+ ;; Use a substitution to avoid setting docbook-xsl as a

+ ;; propagated input.

+ (lambda _

+ #$(let ((docbook-xsl (this-package-input "docbook-xsl")))

+ (file-append docbook-xsl

+ "/xml/xsl/" (package-name docbook-xsl)

+ "-" (package-version docbook-xsl)

+ "/html/chunk.xsl")))

+ #$(let ((docbook-xsl (this-package-input "docbook-xsl")))

+ (file-append docbook-xsl

+ "/xml/xsl/" (package-name docbook-xsl)

+ "-" (package-version docbook-xsl)

+ "/common/en.xsl"))))))

+ ""))))

+ (lambda _

+ (for-each (lambda (prog)

+ (wrap-program prog

+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))))

+ (find-files (string-append #$output "/bin"))))))))

+++ b/gnu/packages/gtk.scm

+ (let ((docbook-xsl-catalog

+ #$(let ((docbook-xsl (this-package-input "docbook-xsl")))

+ (file-append docbook-xsl

+ "/xml/xsl/" (package-name docbook-xsl)

+ "-" (package-version docbook-xsl)

+ "/catalog.xml"))))

+ (for-each (lambda (prog)

+ (wrap-program prog

+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))

+ `("XML_CATALOG_FILES" " " suffix (,docbook-xsl-catalog))))

+ (find-files (string-append #$output "/bin")))))))))

+++ b/gnu/packages/gtk.scm

+++ b/gnu/local.mk

+ %D%/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch \

+ %D%/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \

+ %D%/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch \

+++ b/gnu/packages/gcc.scm

+ "gcc-5.5.0-libstdc++-xmlcatalog.patch"

+ "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch"

+ "gcc-13.2.0-libstdc++-info-install-fix.patch"

+ (patches (search-patches "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch"

+ "gcc-13.2.0-libstdc++-info-install-fix.patch"

+ "gcc-9-strmov-store-file-names.patch"

+ docbook2x

+ (lambda* (#:key make-flags #:allow-other-keys)

+ (apply invoke `("make" ,@make-flags

+ "doc-info"

+ "doc-html"

+ "doc-man"))))

+ (lambda* (#:key make-flags #:allow-other-keys)

+ (apply invoke `("make" ,@make-flags

+ "doc-install-info"

+ "doc-install-html"

+ "doc-install-man")))))))

+++ b/gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch

+# Upstreamed <https://gcc.gnu.org/pipermail/gcc-patches/2023-August/628047.html>

+

+From 2748b8df7a241c5fd6a7c2de6621c5cc56bb6ae1 Mon Sep 17 00:00:00 2001

+Message-Id: <2748b8df7a241c5fd6a7c2de6621c5cc56bb6ae1.1692808412.git.mirai@makinata.eu>

+In-Reply-To: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>

+References: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>

+From: Bruno Victal <mirai@makinata.eu>

+Date: Mon, 21 Aug 2023 20:58:43 +0100

+Subject: [PATCH 2/2] libstdc++: Update docbook xsl URI.

+

+The URI for namespaced docbook-xsl was updated to reflect the current

+DocBook upstream at <https://cdn.docbook.org/>.

+

+libstdc++-v3/Changelog:

+ * acinclude.m4: Update docbook xsl URI.

+ * configure: Regenerate.

+---

+ libstdc++-v3/acinclude.m4 | 2 +-

+ libstdc++-v3/configure | 2 +-

+ 2 files changed, 2 insertions(+), 2 deletions(-)

+

+diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4

+index b25378eaace..152811fd00d 100644

+--- a/libstdc++-v3/acinclude.m4

++++ b/libstdc++-v3/acinclude.m4

+@@ -604,7 +604,7 @@ dnl XSL_STYLE_DIR

+ dnl

+ AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [

+

+-glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/

++glibcxx_docbook_url=http://cdn.docbook.org/release/xsl/current/

+

+ AC_MSG_CHECKING([for local stylesheet directory])

+ glibcxx_local_stylesheets=no

+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure

+index c4da56c3042..d967b137ea1 100755

+--- a/libstdc++-v3/configure

++++ b/libstdc++-v3/configure

+@@ -73923,7 +73923,7 @@ fi

+

+

+

+-glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/

++glibcxx_docbook_url=http://cdn.docbook.org/release/xsl/current/

+

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local stylesheet directory" >&5

+ $as_echo_n "checking for local stylesheet directory... " >&6; }

+--

+2.40.1

+

+++ b/gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch

+# Upstreamed <https://gcc.gnu.org/pipermail/gcc-patches/2023-August/628047.html>

+

+From 2db0606adfdb800f3fcc95f2cb6c13ff76246e5f Mon Sep 17 00:00:00 2001

+Message-Id: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>

+From: Bruno Victal <mirai@makinata.eu>

+Date: Mon, 21 Aug 2023 20:58:22 +0100

+Subject: [PATCH 1/2] libstdc++: Fix 'doc-install-info' rule.

+

+The info manual isn't moved to the expected location after

+generation which causes the install rule for it to fail.

+

+libstdc++-v3/Changelog:

+

+ * doc/Makefile.in: Regenerate.

+ * doc/Makefile.am: Fix 'doc-install-info' rule.

+ Fix typo in commment.

+---

+ libstdc++-v3/doc/Makefile.am | 4 ++--

+ libstdc++-v3/doc/Makefile.in | 4 ++--

+ 2 files changed, 4 insertions(+), 4 deletions(-)

+

+diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am

+index 8371441c62e..373522d593d 100644

+--- a/libstdc++-v3/doc/Makefile.am

++++ b/libstdc++-v3/doc/Makefile.am

+@@ -598,7 +598,7 @@ stamp-pdf-docbook: doc-pdf-docbook-pre doc-xml-single-docbook

+ doc-pdf-docbook: stamp-pdf-docbook

+

+ # TEXINFO, via docbook2X

+-# NB: Both experimental and tempermental

++# NB: Both experimental and temperamental

+ manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi

+ manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info

+ DB2TEXI_FLAGS = \

+@@ -615,7 +615,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo

+

+ stamp-info-docbook: stamp-texinfo-docbook

+ @echo "Generating info files..."

+- $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi}

++ $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info}

+ $(STAMP) stamp-info-docbook

+

+ doc-texinfo-docbook: stamp-texinfo-docbook

+diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in

+index 21ad8557f7a..c19e3e3044c 100644

+--- a/libstdc++-v3/doc/Makefile.in

++++ b/libstdc++-v3/doc/Makefile.in

+@@ -645,7 +645,7 @@ manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf

+ DBLATEX_FLAGS = --verbose --pdf --dump --debug --tmpdir=${docbook_outdir}/latex

+

+ # TEXINFO, via docbook2X

+-# NB: Both experimental and tempermental

++# NB: Both experimental and temperamental

+ manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi

+ manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info

+ DB2TEXI_FLAGS = \

+@@ -1096,7 +1096,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo

+

+ stamp-info-docbook: stamp-texinfo-docbook

+ @echo "Generating info files..."

+- $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi}

++ $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info}

+ $(STAMP) stamp-info-docbook

+

+ doc-texinfo-docbook: stamp-texinfo-docbook

+

+base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509

+--

+2.40.1

+

+++ b/gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch

+From 7f792d2acc0d3eeb95c6f8e0acd72ae304cec9be Mon Sep 17 00:00:00 2001

+Message-Id: <7f792d2acc0d3eeb95c6f8e0acd72ae304cec9be.1692813549.git.mirai@makinata.eu>

+From: Jonathan Wakely <jwakely@redhat.com>

+Date: Wed, 27 Feb 2019 11:25:44 +0000

+Subject: [PATCH] PR libstdc++/89466 avoid slow xsltproc command in configure

+

+Note: Backported from a4395a846a9343960714568e7cf8af4425e63a50.

+

+Certain broken versions of xsltproc ignore the --nonet option and will

+attempt to fetch the docbook stylesheet from the WWW when it isn't in

+the local XML catalog.

+

+This patch checks for the local stylesheet directory first, and doesn't

+use xsltproc if no local stylesheets are found. Checking for the local

+directory is done using xmlcatalog if available, only checking the

+hardcoded list of directories if xmlcatalog fails. The right directory

+for Suse is added to the hardcoded list.

+

+This should avoid doing an xsltproc check that would need to download

+the stylesheet, so no network connection is made even if a broken

+xsltproc is present.

+

+ PR libstdc++/89466

+ * acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Reorder check for local

+ stylesheet directories before check for xsltproc. Try to use

+ xmlcatalog to find local stylesheet directory before trying hardcoded

+ paths. Add path used by suse to hardcoded paths. Adjust xsltproc

+ check to look for the same stylesheet as doc/Makefile.am uses. Don't

+ use xsltproc if xmlcatalog fails to find a local stylesheet.

+ * configure.ac: Check for xmlcatalog.

+ * Makefile.in: Regenerate.

+ * configure: Likewise.

+ * doc/Makefile.in: Likewise.

+ * include/Makefile.in: Likewise.

+ * libsupc++/Makefile.in: Likewise.

+ * po/Makefile.in: Likewise.

+ * python/Makefile.in: Likewise.

+ * src/Makefile.in: Likewise.

+ * src/c++11/Makefile.in: Likewise.

+ * src/c++98/Makefile.in: Likewise.

+ * src/filesystem/Makefile.in: Likewise.

+ * testsuite/Makefile.in: Likewise.

+

+From-SVN: r269249

+Modified-by: Bruno Victal <mirai@makinata.eu>

+---

+ libstdc++-v3/Makefile.in | 1 +

+ libstdc++-v3/acinclude.m4 | 47 +++++++------

+ libstdc++-v3/configure | 90 +++++++++++++++++++------

+ libstdc++-v3/configure.ac | 1 +

+ libstdc++-v3/doc/Makefile.in | 1 +

+ libstdc++-v3/include/Makefile.in | 1 +

+ libstdc++-v3/libsupc++/Makefile.in | 1 +

+ libstdc++-v3/po/Makefile.in | 1 +

+ libstdc++-v3/python/Makefile.in | 1 +

+ libstdc++-v3/src/Makefile.in | 1 +

+ libstdc++-v3/src/c++11/Makefile.in | 1 +

+ libstdc++-v3/src/c++98/Makefile.in | 1 +

+ libstdc++-v3/src/filesystem/Makefile.in | 1 +

+ libstdc++-v3/testsuite/Makefile.in | 1 +

+ 14 files changed, 109 insertions(+), 40 deletions(-)

+

+diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in

+index a9451e19a96..6aee8281f77 100644

+--- a/libstdc++-v3/Makefile.in

++++ b/libstdc++-v3/Makefile.in

+@@ -230,6 +230,7 @@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@

+ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@

+ WARN_FLAGS = @WARN_FLAGS@

+ WERROR = @WERROR@

++XMLCATALOG = @XMLCATALOG@

+ XMLLINT = @XMLLINT@

+ XSLTPROC = @XSLTPROC@

+ XSL_STYLE_DIR = @XSL_STYLE_DIR@

+diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4

+index 18b7b6638ec..fde3fb6da6e 100644

+--- a/libstdc++-v3/acinclude.m4

++++ b/libstdc++-v3/acinclude.m4

+@@ -674,34 +674,43 @@ dnl XSL_STYLE_DIR

+ dnl

+ AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [

+

+-AC_MSG_CHECKING([for docbook stylesheets for documentation creation])

+-glibcxx_stylesheets=no

+-if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude http://docbook.sourceforge.net/release/xsl-ns/current/xhtml-1_1/docbook.xsl - 2>/dev/null; then

+- glibcxx_stylesheets=yes

+-fi

+-AC_MSG_RESULT($glibcxx_stylesheets)

++glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/

+

+ AC_MSG_CHECKING([for local stylesheet directory])

+ glibcxx_local_stylesheets=no

+-if test x"$glibcxx_stylesheets" = x"yes"; then

+- if test -d /usr/share/sgml/docbook/xsl-ns-stylesheets; then

+- glibcxx_local_stylesheets=yes

+- XSL_STYLE_DIR=/usr/share/sgml/docbook/xsl-ns-stylesheets

+- fi

+- if test -d /usr/share/xml/docbook/stylesheet/docbook-xsl-ns; then

+- glibcxx_local_stylesheets=yes

+- XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns

+- fi

+- if test -d /usr/share/xml/docbook/stylesheet/nwalsh5/current; then

+- glibcxx_local_stylesheets=yes

+- XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/nwalsh5/current

+- fi

++if test x${XMLCATALOG} = xyes && xsl_style_dir=`xmlcatalog "" $glibcxx_docbook_url 2>/dev/null`

++then

++ XSL_STYLE_DIR=`echo $xsl_style_dir | sed -n 's;^file://;;p'`

++ glibcxx_local_stylesheets=yes

++else

++ for dir in \

++ /usr/share/sgml/docbook/xsl-ns-stylesheets \

++ /usr/share/xml/docbook/stylesheet/docbook-xsl-ns \

++ /usr/share/xml/docbook/stylesheet/nwalsh5/current \

++ /usr/share/xml/docbook/stylesheet/nwalsh/current

++ do

++ if test -d $dir; then

++ glibcxx_local_stylesheets=yes

++ XSL_STYLE_DIR=$dir

++ break

++ fi

++ done

+ fi

+ AC_MSG_RESULT($glibcxx_local_stylesheets)

+

+ if test x"$glibcxx_local_stylesheets" = x"yes"; then

+ AC_SUBST(XSL_STYLE_DIR)

+ AC_MSG_NOTICE($XSL_STYLE_DIR)

++

++ AC_MSG_CHECKING([for docbook stylesheets for documentation creation])

++ glibcxx_stylesheets=no

++ if test x${XMLCATALOG} = xno || xmlcatalog "" $glibcxx_docbook_url/xhtml/docbook.xsl >/dev/null 2>&1; then

++ if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude $glibcxx_docbook_url/xhtml/docbook.xsl - 2>/dev/null; then

++ glibcxx_stylesheets=yes

++ fi

++ fi

++ AC_MSG_RESULT($glibcxx_stylesheets)

++

+ else

+ glibcxx_stylesheets=no

+ fi

+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure

+index a51dfe6eb13..0c462490b81 100755

+--- a/libstdc++-v3/configure

++++ b/libstdc++-v3/configure

+@@ -634,6 +634,7 @@ BUILD_EPUB_TRUE

+ XSL_STYLE_DIR

+ XMLLINT

+ XSLTPROC

++XMLCATALOG

+ DOT

+ DOXYGEN

+ BUILD_INFO_FALSE

+@@ -79678,6 +79679,44 @@ fi

+

+

+ # Check for docbook

++# Extract the first word of "xmlcatalog", so it can be a program name with args.

++set dummy xmlcatalog; ac_word=$2

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

++$as_echo_n "checking for $ac_word... " >&6; }

++if ${ac_cv_prog_XMLCATALOG+:} false; then :

++ $as_echo_n "(cached) " >&6

++else

++ if test -n "$XMLCATALOG"; then

++ ac_cv_prog_XMLCATALOG="$XMLCATALOG" # Let the user override the test.

++else

++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

++for as_dir in $PATH

++do

++ IFS=$as_save_IFS

++ test -z "$as_dir" && as_dir=.

++ for ac_exec_ext in '' $ac_executable_extensions; do

++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

++ ac_cv_prog_XMLCATALOG="yes"

++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

++ break 2

++ fi

++done

++ done

++IFS=$as_save_IFS

++

++ test -z "$ac_cv_prog_XMLCATALOG" && ac_cv_prog_XMLCATALOG="no"

++fi

++fi

++XMLCATALOG=$ac_cv_prog_XMLCATALOG

++if test -n "$XMLCATALOG"; then

++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCATALOG" >&5

++$as_echo "$XMLCATALOG" >&6; }

++else

++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

++$as_echo "no" >&6; }

++fi

++

++

+ # Extract the first word of "xsltproc", so it can be a program name with args.

+ set dummy xsltproc; ac_word=$2

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

+@@ -79756,31 +79795,28 @@ fi

+

+

+

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook stylesheets for documentation creation" >&5

+-$as_echo_n "checking for docbook stylesheets for documentation creation... " >&6; }

+-glibcxx_stylesheets=no

+-if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude http://docbook.sourceforge.net/release/xsl-ns/current/xhtml-1_1/docbook.xsl - 2>/dev/null; then

+- glibcxx_stylesheets=yes

+-fi

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_stylesheets" >&5

+-$as_echo "$glibcxx_stylesheets" >&6; }

++glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/

+

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local stylesheet directory" >&5

+ $as_echo_n "checking for local stylesheet directory... " >&6; }

+ glib

+++ b/gnu/packages/gcc.scm

+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>

+ (list

+ #:out-of-source? #t

+ #:tests? #f ;it's just documentation

+ #:phases

+ #~(modify-phases %standard-phases

+ (add-before 'configure 'chdir

+ (lambda _

+ (chdir "libstdc++-v3")))

+ (add-before 'configure 'set-xsl-directory

+ (lambda _

+ (substitute* (find-files "doc"

+ "^Makefile\\.in$")

+ (("@XSL_STYLE_DIR@")

+ (string-append #$(this-package-native-input "docbook-xsl")

+ "/xml/xsl/"

+ (strip-store-file-name docbook))))))

+ (replace 'build

+ (lambda _

+ ;; XXX: There's also a 'doc-info' target, but it

+ ;; relies on docbook2X, which itself relies on

+ ;; DocBook 4.1.2, which is not really usable

+ ;; (lacks a catalog.xml.)

+ (invoke "make"

+ "doc-html"

+ "doc-man")))

+ (replace 'install

+ (lambda _

+ (invoke "make"

+ "doc-install-html"

+ "doc-install-man"))))))

+++ b/gnu/packages/benchmark.scm

+++ b/gnu/packages/cluster.scm

+++ b/gnu/packages/freedesktop.scm

+ (inputs (list expat libxml2))

+++ b/gnu/packages/glib.scm

+++ b/gnu/packages/gnome.scm