diff --git a/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch new file mode 100644 index 0000000..fe82e40 --- /dev/null +++ b/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch @@ -0,0 +1,31 @@ +From 2a23a33b06fab59b351358fba1a4969902217b58 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Mon, 27 Nov 2023 15:11:45 +0100 +Subject: [PATCH] osinfo: Make xmlError struct constant in + propagate_libxml_error() + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Signed-off-by: Michal Privoznik +--- + osinfo/osinfo_install_script.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c +index 5800f37..303245a 100644 +--- a/osinfo/osinfo_install_script.c ++++ b/osinfo/osinfo_install_script.c +@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN + + static void propagate_libxml_error(GError **error, const char *format, ...) + { +- xmlErrorPtr err = xmlGetLastError(); ++ const xmlError *err = xmlGetLastError(); + char *prefix; + va_list ap; + +-- +2.45.1 + diff --git a/libosinfo.changes b/libosinfo.changes index e428f51..b9809bf 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 26 10:18:24 UTC 2024 - Christophe Marin + +- Add upstream change: + * 0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch + ------------------------------------------------------------------- Mon Mar 4 14:24:21 MST 2024 - carnold@suse.com diff --git a/libosinfo.spec b/libosinfo.spec index 9184e9e..882b55f 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -27,6 +27,8 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ URL: https://releases.pagure.org/libosinfo Source0: %{url}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM -- libxml 2.12 compatibility +Patch0: 0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch BuildRequires: gtk-doc BuildRequires: hwdata BuildRequires: libcurl-devel