summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-03-07 11:23:36 -0800
committerKhem Raj <raj.khem@gmail.com>2024-03-08 10:07:27 -0800
commitcbb570cdd963de547e4fa94ca1851d8d889a7cf3 (patch)
treefdb7e64baea59a27e5e0e22dab5880b46c87d3ae /meta-oe/recipes-support
parenta30f1158d9541954f0aba2915797b95ada6b0a09 (diff)
downloadmeta-openembedded-cbb570cdd963de547e4fa94ca1851d8d889a7cf3.tar.gz
libosinfo: Fix build with libxml2 v2.12
Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Alexander Kanavin <alex@linutronix.de>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch32
-rw-r--r--meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
new file mode 100644
index 000000000..467c6b4ba
--- /dev/null
+++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
@@ -0,0 +1,32 @@
1From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001
2From: Michal Privoznik <mprivozn@redhat.com>
3Date: Mon, 27 Nov 2023 15:11:45 +0100
4Subject: [PATCH] osinfo: Make xmlError struct constant in
5 propagate_libxml_error()
6
7In libxml2 commit v2.12.0~14 the API changed so that
8xmlGetLastError() returns pointer to a constant xmlError struct.
9Reflect this change in our code.
10
11Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/merge_requests/155]
12Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
13---
14 osinfo/osinfo_install_script.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
18index 5800f37..303245a 100644
19--- a/osinfo/osinfo_install_script.c
20+++ b/osinfo/osinfo_install_script.c
21@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN
22
23 static void propagate_libxml_error(GError **error, const char *format, ...)
24 {
25- xmlErrorPtr err = xmlGetLastError();
26+ const xmlError *err = xmlGetLastError();
27 char *prefix;
28 va_list ap;
29
30--
312.44.0
32
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
index 68d917ffe..8ef7ac3df 100644
--- a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
+++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
8SRC_URI = " \ 8SRC_URI = " \
9 git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \ 9 git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \
10 file://0001-meson.build-allow-crosscompiling-gir.patch \ 10 file://0001-meson.build-allow-crosscompiling-gir.patch \
11 file://0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch \
11" 12"
12 13
13SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9" 14SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9"