diff options
| author |   Michal Privoznik <michal.privoznik@gmail.com> | 2023-11-21 16:03:22 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-11-22 11:32:19 +0000 |
| commit | 4de0e953c65c43911a883715c0c236f63d8aa0db (patch) | |
| tree | 7c18200baeea2ab06da3accc42da200170fbba53 /app-emulation/libvirt | |
| parent | www-servers/nginx: add tests (diff) | |
| download | gentoo-4de0e953c65c43911a883715c0c236f63d8aa0db.tar.gz gentoo-4de0e953c65c43911a883715c0c236f63d8aa0db.tar.bz2 gentoo-4de0e953c65c43911a883715c0c236f63d8aa0db.zip | |
app-emulation/libvirt: Fix build with dev-libs/libxml2-2.12.0
As of its 2.12.0 release, libxml2 cleaned up header files which
rendered libvirt unable to compile. Backport the fix from
upstream repo.
After this, there are still some warnings about use of a
deprecated function, but those are harmless and we'll get fix
with new release.
Bug: https://bugs.gentoo.org/917516
Signed-off-by: Michal Privoznik <michal.privoznik@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33929
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/libvirt')
7 files changed, 42 insertions, 0 deletions
diff --git a/app-emulation/libvirt/files/libvirt-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch b/app-emulation/libvirt/files/libvirt-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch new file mode 100644 index 000000000000..b24236be8751 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch @@ -0,0 +1,36 @@ +From 7a5f232be2269e74943a029c0e8b1b0124674a6c Mon Sep 17 00:00:00 2001 +Message-ID: <7a5f232be2269e74943a029c0e8b1b0124674a6c.1700576185.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 20 Nov 2023 03:18:12 +0100 +Subject: [PATCH] virxml: include <libxml/xmlsave.h> for xmlIndentTreeOutput + declaration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After libxml2's commit of v2.12.0~101 we no longer get +xmlIndentTreeOutput declaration by us including just +libxml/xpathInternals.h and libxml2's header files leakage. + +Resolves: https://bugs.gentoo.org/917516 +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +Reviewed-by: Ján Tomko <jtomko@redhat.com> +--- + src/util/virxml.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/virxml.c b/src/util/virxml.c +index 0c1eae8c3c..4f215a0e59 100644 +--- a/src/util/virxml.c ++++ b/src/util/virxml.c +@@ -24,6 +24,7 @@ + #include <math.h> /* for isnan() */ + #include <sys/stat.h> + ++#include <libxml/xmlsave.h> + #include <libxml/xpathInternals.h> + + #include "virerror.h" +-- +2.41.0 + diff --git a/app-emulation/libvirt/libvirt-9.3.0-r1.ebuild b/app-emulation/libvirt/libvirt-9.3.0-r1.ebuild index d6df504de5a0..7e3a51cbc605 100644 --- a/app-emulation/libvirt/libvirt-9.3.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-9.3.0-r1.ebuild @@ -146,6 +146,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch "${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch ) pkg_setup() { diff --git a/app-emulation/libvirt/libvirt-9.4.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.4.0-r4.ebuild index b7825aeffae0..eafdb54316ee 100644 --- a/app-emulation/libvirt/libvirt-9.4.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-9.4.0-r4.ebuild @@ -147,6 +147,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-9.4.0-fix-paths-for-apparmor.patch "${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch ) pkg_setup() { diff --git a/app-emulation/libvirt/libvirt-9.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-9.5.0-r1.ebuild index c1e868edd1b4..070720fbef3c 100644 --- a/app-emulation/libvirt/libvirt-9.5.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-9.5.0-r1.ebuild @@ -147,6 +147,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-9.4.0-fix-paths-for-apparmor.patch "${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch ) pkg_setup() { diff --git a/app-emulation/libvirt/libvirt-9.6.0.ebuild b/app-emulation/libvirt/libvirt-9.6.0.ebuild index ac2cd4e25b3e..eea4f073d671 100644 --- a/app-emulation/libvirt/libvirt-9.6.0.ebuild +++ b/app-emulation/libvirt/libvirt-9.6.0.ebuild @@ -146,6 +146,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch ) pkg_setup() { diff --git a/app-emulation/libvirt/libvirt-9.8.0.ebuild b/app-emulation/libvirt/libvirt-9.8.0.ebuild index f170ab26652d..429926373b1a 100644 --- a/app-emulation/libvirt/libvirt-9.8.0.ebuild +++ b/app-emulation/libvirt/libvirt-9.8.0.ebuild @@ -146,6 +146,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch ) pkg_setup() { diff --git a/app-emulation/libvirt/libvirt-9.9.0.ebuild b/app-emulation/libvirt/libvirt-9.9.0.ebuild index 195489fd346d..6e0b4768f2aa 100644 --- a/app-emulation/libvirt/libvirt-9.9.0.ebuild +++ b/app-emulation/libvirt/libvirt-9.9.0.ebuild @@ -146,6 +146,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch ) pkg_setup() { |