Accepting request 1227840 from Virtualization
Update osinfo-db-tools to version 1.12.0 OBS-URL: https://build.opensuse.org/request/show/1227840 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osinfo-db-tools?expand=0&rev=16
This commit is contained in:
commit
61a854c209
@ -1,46 +0,0 @@
|
||||
Subject: Make xmlError structs constant
|
||||
From: Michal Privoznik mprivozn@redhat.com Mon Nov 27 15:04:43 2023 +0100
|
||||
Date: Mon Nov 27 15:04:43 2023 +0100:
|
||||
Git: 34378a4ac257f2f5fcf364786d1634a8c36b304f
|
||||
|
||||
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>
|
||||
|
||||
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);
|
BIN
osinfo-db-tools-1.11.0.tar.xz
(Stored with Git LFS)
BIN
osinfo-db-tools-1.11.0.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
osinfo-db-tools-1.12.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
osinfo-db-tools-1.12.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 2 11:12:22 MST 2024 - carnold@suse.com
|
||||
|
||||
- Update to version 1.12.0 (jsc#PED-8910)
|
||||
* Fix some memory leaks
|
||||
* Fix runtime warnings on osinfo-db-export
|
||||
* Adapt to libxml2 changes
|
||||
* Several CI improvements
|
||||
* Several translation improvements
|
||||
- Drop 001-Make-xmlError-structs-constant.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 1 13:35:02 MDT 2024 - carnold@suse.com
|
||||
|
||||
|
@ -17,14 +17,14 @@
|
||||
|
||||
|
||||
Name: osinfo-db-tools
|
||||
Version: 1.11.0
|
||||
Version: 1.12.0
|
||||
Release: 0
|
||||
Summary: Tools for managing the osinfo database
|
||||
License: LGPL-2.1+ and GPL-2.0+
|
||||
Group: System/Management
|
||||
Url: https://releases.pagure.org/libosinfo/
|
||||
Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
|
||||
Patch1: 001-Make-xmlError-structs-constant.patch
|
||||
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: json-glib-devel
|
||||
|
Loading…
Reference in New Issue
Block a user