CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libosinfo: Fix build with libxml2 v2.12

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex@linutronix.de>
This commit is contained in:
Khem Raj 2024-03-07 11:23:36 -08:00
parent a30f1158d9
commit cbb570cdd9
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch Normal file
View File

@ -0,0 +1,32 @@
From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
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.
Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/merge_requests/155]
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
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.44.0

1
meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = " \
git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \
file://0001-meson.build-allow-crosscompiling-gir.patch \
file://0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch \
"
SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9"