diff mbox series

[meta-oe,14/46] osinfo-db-tools: upgrade 1.11.0 -> 1.12.0

Message ID 1730874660-2364-14-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-gnome,01/46] babl: upgrade 0.1.108 -> 0.1.110 | expand

Commit Message

Mingyu Wang (Fujitsu) Nov. 6, 2024, 6:30 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Make-xmlError-structs-constant.patch
removed since it's included in 1.12.0

Changelog:
==========
- Fix some memory leaks
- Fix runtime warnings on osinfo-db-export
- Adapt to libxml2 changes
- Several CI improvements
- Several translation improvements

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-Make-xmlError-structs-constant.patch | 56 -------------------
 ...ls_1.11.0.bb => osinfo-db-tools_1.12.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch
 rename meta-oe/recipes-support/libosinfo/{osinfo-db-tools_1.11.0.bb => osinfo-db-tools_1.12.0.bb} (78%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch b/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch
deleted file mode 100644
index edff5732c..000000000
--- a/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch
+++ /dev/null
@@ -1,56 +0,0 @@ 
-Upstream-Status: Backport [https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 27 Nov 2023 15:04:43 +0100
-Subject: [PATCH] Make xmlError structs constant
-
-In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so
-that:
-
-1) xmlGetLastError() returns pointer to a constant xmlError
-   struct, and
-
-2) xmlSetStructuredErrorFunc() changed the signature of callback
-   (validate_structured_error_nop()), it too is passed pointer to
-   a constant xmlError struct.
-
-But of course, older libxml2 expects different callback
-signature. Therefore, we need to typecast it anyway.
-
-Also, drop obviously incorrect @error annotation in
-validate_structured_error_nop; the variable is used.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- tools/osinfo-db-validate.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
-index a721b4d..b1434a6 100644
---- a/tools/osinfo-db-validate.c
-+++ b/tools/osinfo-db-validate.c
-@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED,
- }
- 
- static void validate_structured_error_nop(void *userData G_GNUC_UNUSED,
--                                          xmlErrorPtr error G_GNUC_UNUSED)
-+                                          const xmlError *error)
- {
-     if (error->file)
-         g_printerr("%s:%d %s", error->file, error->line, error->message);
-@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
-     g_autofree gchar *schemapath = NULL;
- 
-     xmlSetGenericErrorFunc(NULL, validate_generic_error_nop);
--    xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop);
-+    /* Drop this typecast when >=libxml2-2.12.0 is required */
-+    xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop);
- 
-     schemapath = g_file_get_path(schema);
-     rngParser = xmlRelaxNGNewParserCtxt(schemapath);
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb
similarity index 78%
rename from meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb
rename to meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb
index 0584bee15..4434a851e 100644
--- a/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb
+++ b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb
@@ -7,9 +7,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "glib-2.0 json-glib libarchive libsoup-2.4"
 
 SRC_URI = "git://gitlab.com/libosinfo/osinfo-db-tools.git;branch=main;protocol=https \
-           file://0001-Make-xmlError-structs-constant.patch \
            "
-SRCREV = "85a1788c6977419b6facad11dbfbf823e739eb3b"
+SRCREV = "e5564be303bfac49cc3490bd0fada342cd65566f"
 
 S = "${WORKDIR}/git"