diff --git a/0001-docs-Fix-template-matching-in-page.xsl.patch b/0001-docs-Fix-template-matching-in-page.xsl.patch new file mode 100644 index 0000000..7453957 --- /dev/null +++ b/0001-docs-Fix-template-matching-in-page.xsl.patch @@ -0,0 +1,60 @@ +From 54814c87f3706cc8eb894634ebef0f9cf7dabae6 Mon Sep 17 00:00:00 2001 +From: Martin Kletzander +Date: Mon, 21 Feb 2022 09:26:13 +0100 +Subject: [PATCH] docs: Fix template matching in page.xsl + +Our last default template had a match of "node()" which incidentally matched +everything, including text nodes. Since this has the same priority according to +the XSLT spec, section 5.5: + + https://www.w3.org/TR/1999/REC-xslt-19991116#conflict + +this is an error. Also according to the same spec section, the XSLT processor +may signal the error or pick the last rule. + +This was uncovered with libxslt 1.1.35 which contains the following commit: + + https://gitlab.gnome.org/GNOME/libxslt/-/commit/b0074eeca3c6b21b4da14fdf712b853900c51635 + +which makes the build fail with: + + runtime error: file ../docs/page.xsl line 223 element element + xsl:element: The effective name '' is not a valid QName. + +because our last rule also matches text nodes and we are trying to extract the +node name out of them. + +To fix this we change the match to "*" which only matches elements and not all +the nodes, and to avoid any possible errors with different XSLT processors we +also bump the priority of the match="text()" rule a little higher, just in case +someone needs to use an XSLT processor that chooses signalling the error instead +of the optional recovery. + +https://bugs.gentoo.org/833586 + +Signed-off-by: Martin Kletzander +--- + docs/page.xsl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/page.xsl b/docs/page.xsl +index fd67918d3b..72a6fa0842 100644 +--- a/docs/page.xsl ++++ b/docs/page.xsl +@@ -215,11 +215,11 @@ + + + +- ++ + + + +- ++ + + + +-- +2.35.1 + diff --git a/libvirt.spec b/libvirt.spec index a8fa378..9fca42e 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -223,6 +223,9 @@ Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz # ERROR internal error: cannot parse process status data for pid # Upstream commit 105dace22cc7b5 Patch1: 0001-Revert-report-error-when-virProcessGetStatInfo-is-un.patch +# Fix build with newest libxslt +# Upstream commit 54814c87f3706c +Patch2: 0001-docs-Fix-template-matching-in-page.xsl.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release}