diff options
Diffstat (limited to 'meta-oe/recipes-support/libosinfo/libosinfo')
2 files changed, 60 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch new file mode 100644 index 0000000000..778a1f6e1e --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch @@ -0,0 +1,28 @@ +From 123b5a4c5e09f4262d4545a0bc5edb01a19b6b76 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 21 Aug 2023 10:06:55 +0200 +Subject: [PATCH] meson.build: allow crosscompiling gir + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 39b739e..46f2252 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('enable-introspection')) +-enable_introspection = gir.found() and not meson.is_cross_build() ++enable_introspection = gir.found() + + # vala + vapi_opt = get_option('enable-vala') +-- +2.41.0 + 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 0000000000..467c6b4baf --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch @@ -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 + |