From 2bdd687bd7e3ce7c7bf86153ebc1ce7a1af10119 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Feb 2021 22:24:25 +0100 Subject: [PATCH] doc: Unify DocBook versions again Fixes a regression in version monoculture that occurred since the first attempt in https://github.com/flatpak/flatpak/pull/3760 --- doc/flatpak-pin.xml | 4 ++-- doc/reference/Makefile.am | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/flatpak-pin.xml b/doc/flatpak-pin.xml index 9fa8217a..04e5312a 100644 --- a/doc/flatpak-pin.xml +++ b/doc/flatpak-pin.xml @@ -1,6 +1,6 @@ - + diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 88bd31bb..6aaa3451 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -88,6 +88,10 @@ TESTS = $(GTKDOC_CHECK) endif sgml.stamp: $(dbus_stamp_files) +# gdbus-codegen hardcodes DocBook version + $(AM_V_GEN)$(SED) -i \ + -e 's|http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd|http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd|' \ + -e 's|-//OASIS//DTD DocBook XML V4.1.2//EN|-//OASIS//DTD DocBook XML V4.5//EN|' $(xml_files) dbus-%.stamp: $(top_srcdir)/data/%.xml $(AM_V_GEN)$(GDBUS_CODEGEN) --generate-docbook=dbus $<