Accepting request 1184376 from Virtualization

Fix for bsc#1225908 - Package osinfo-db-tools does not build with gcc14

OBS-URL: https://build.opensuse.org/request/show/1184376
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osinfo-db-tools?expand=0&rev=15

001-Make-xmlError-structs-constant.patch

@@ -0,0 +1,46 @@
+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);

osinfo-db-tools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul  1 13:35:02 MDT 2024 - carnold@suse.com
+
+- bsc#1225908 - Package osinfo-db-tools does not build with gcc14
+  because of new errors
+  001-Make-xmlError-structs-constant.patch
+
 -------------------------------------------------------------------
 Mon Nov 13 13:56:39 MST 2023 - carnold@suse.com
 

osinfo-db-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package osinfo-db-tools
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,7 @@ 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
@@ -40,7 +41,7 @@ This package provides tools for managing the osinfo database of
 information about operating systems for use with virtualization
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %meson