The gtk-doc wrapped binaries use XML_CATALOG_FILES to perform XML catalog
lookup and come with docbook-xsl within the variable which fixes the
docbook-xsl stylesheet lookup related failures with these packages.
This makes it unnecessary to include libxml2 as the cause of error was usually
with the gtk-doc binaries.
* gnu/packages/gnome.scm (gupnp-igd, dee, zeitgeist, libnma)[native-inputs]:
Remove libxml2.
* gnu/packages/rpm.scm (libmodulemd)[native-inputs]: Ditto.
* gnu/packages/security-token.scm (libu2f-host)[native-inputs]: Ditto.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
The native-search-paths from libxslt are reused within xmlto to provide
XML_CATALOG_FILES and SGML_CATALOG_FILES so it's unnecessary to include
libxml2 for the same effect.
* gnu/packages/wm.scm (i3status, awesome)[native-inputs]: Remove libxml2.
* gnu/packages/xml.scm (opensp)[native-inputs]: Ditto.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
XML_CATALOG_FILES is already set within xmlto which is a requirement for
building the documentation.
Note: perf depends on zlib which was propagated by libxml2 so we must re-add
it here.
* gnu/packages/linux.scm (perf)[inputs]: Remove libxml2. Add zlib. Relocate
docbook-xsl, xmlto and asciidoc to …
[native-inputs]: … here.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch: New file.
* gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch: Ditto.
* gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch: Ditto.
* gnu/local.mk: Register them.
* gnu/packages/gcc.scm
(gcc-5)[source]: Use gcc-5.5.0-libstdc++-xmlcatalog.patch,
gcc-13.2.0-libstdc++-docbook-xsl-uri.patch and
gcc-13.2.0-libstdc++-info-install-fix.patch.
(gcc-9)[source]: Use gcc-13.2.0-libstdc++-docbook-xsl-uri.patch and
gcc-13.2.0-libstdc++-info-install-fix.patch.
(make-libstdc++-doc)[arguments]<#:phases>: Remove 'set-xsl-directory.
Adjust 'build and 'install for info documentation and to respect make-flags.
[native-inputs]: Add docbook2x.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ie3b9de0328a10efadb28d211c3fe03f9b7aaf87f
Prefer XML catalog resolution over substitutions on XML files.
* gnu/packages/gtk.scm (gtk-doc)[arguments]<#:phases>: Remove
'patch-gtk-doc-scan. Wrap XML_CATALOG_FILES within 'wrap-executables.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
The actual dependency is docbook-to-man which is a completely different
project [1]. (unrelated to docbook2x and docbook-utils)
[1]: <https://www.oasis-open.org/docbook/tools/dtm/>
* gnu/packages/networking.scm (tunctl): Update comment.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/linux.scm (alsa-utils)[arguments]<#:configure-flags>: Re-enable
xmlto for building manpages.
[inputs]: Move xmlto to …
[native-inputs]: … here and restyle. Add docbook-xml-4.2 and docbook-xsl.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Observations:
1. No longer required for XML_CATALOG_FILES.
These are already adequately set within the used dependencies
2. It's not required for gnome-session but by libxkbcommon.
libxkbcommon was fixed to convey this by use of a symlink.
2.1. Shouldn't count as a native-input but as a regular input.
… since this is a dependency for xkbregistry (from libxkbcommon).
* gnu/packages/gnome.scm (gnome-session)[native-inputs]: Remove libxml2.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ie2300d1c24c03223a6adeba8bd7c415b5bc677b0
xkbregistry.pc lists libxml2 as a requirement.
Use a symlink for the libxml-2.0.pc to avoid setting libxml2 as a
propagated-input.
* gnu/packages/xdisorg.scm (libxkbcommon)[arguments]<#:phases>: Add
symlink-pc.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
XML_CATALOG_FILES is already set by xsltproc.
* gnu/packages/freedesktop.scm (udisks)[arguments]<#:make-flags>: Remove.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
The xmlto error[1] was due to libsepol using an unversioned PUBLIC identifier
for DocBook 4.2.
[1]: <https://pagure.io/xmlto/blob/6fa6a0e07644f20abf2596f78a60112713e11cbe/f/FAQ>
* gnu/packages/patches/libsepol-versioned-docbook.patch: New file.
* gnu/local.mk: Register it.
* gnu/packages/selinux.scm (libsepol)[source]: Apply it.
(secilc)[arguments]: Drop xmlto workaround.
[native-inputs]: Add docbook-xml-4.2.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I152dd7a30b2a310ed6589133bc98f5eef8a190a1
Grepping through the built package, gtk-doc invokes 'xsltproc' so we add
%libxslt-search-paths to native-search-paths in order for 'xsltproc' to find
the XML/SGML catalog files.
* gnu/packages/gtk.scm (gtk-doc)[native-search-paths]: Add %libxslt-search-paths.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Otherwise when xmlto invokes xsltproc it will fail to find the XML catalog
files.
* gnu/packages/xml.scm (xmlto)[native-search-paths]: Add libxslt
native-search-paths to its own.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
According to the manpage, it has both XML and SGML catalog support through the
XML_CATALOG_FILES (resp. SGML_CATALOG_FILES) environment variables through
db2x_xsltproc.
* gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Don't hardcode
XML_CATALOG_FILES environmment variable.
[native-search-paths]: Add %libxslt-search-paths.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
