Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package osinfo-db-tools for openSUSE:Factory 
checked in at 2024-07-02 18:14:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osinfo-db-tools (Old)
 and      /work/SRC/openSUSE:Factory/.osinfo-db-tools.new.18349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "osinfo-db-tools"

Tue Jul  2 18:14:58 2024 rev:15 rq:1184376 version:1.11.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/osinfo-db-tools/osinfo-db-tools.changes  
2023-12-12 19:32:46.689674392 +0100
+++ 
/work/SRC/openSUSE:Factory/.osinfo-db-tools.new.18349/osinfo-db-tools.changes   
    2024-07-02 18:15:03.948380580 +0200
@@ -1,0 +2,7 @@
+Mon Jul  1 13:35:02 MDT 2024 - [email protected]
+
+- bsc#1225908 - Package osinfo-db-tools does not build with gcc14
+  because of new errors
+  001-Make-xmlError-structs-constant.patch
+
+-------------------------------------------------------------------

New:
----
  001-Make-xmlError-structs-constant.patch

BETA DEBUG BEGIN:
  New:  because of new errors
  001-Make-xmlError-structs-constant.patch
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ osinfo-db-tools.spec ++++++
--- /var/tmp/diff_new_pack.0QN9hD/_old  2024-07-02 18:15:04.652406342 +0200
+++ /var/tmp/diff_new_pack.0QN9hD/_new  2024-07-02 18:15:04.652406342 +0200
@@ -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 @@
 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 @@
 information about operating systems for use with virtualization
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %meson

++++++ 001-Make-xmlError-structs-constant.patch ++++++
Subject: Make xmlError structs constant
From: Michal Privoznik [email protected] 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 <[email protected]>

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);

Reply via email to