Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libmusicbrainz for openSUSE:Factory checked in at 2024-04-21 20:25:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmusicbrainz (Old) and /work/SRC/openSUSE:Factory/.libmusicbrainz.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmusicbrainz" Sun Apr 21 20:25:07 2024 rev:25 rq:1168851 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libmusicbrainz/libmusicbrainz.changes 2021-07-10 22:55:09.199457162 +0200 +++ /work/SRC/openSUSE:Factory/.libmusicbrainz.new.26366/libmusicbrainz.changes 2024-04-21 20:25:47.674648744 +0200 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Thu Apr 18 09:42:20 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org> + +- Add libmusicbrainz-libxml2.12.patch: Fix build against libxml + 2.12. + +------------------------------------------------------------------- New: ---- libmusicbrainz-libxml2.12.patch BETA DEBUG BEGIN: New: - Add libmusicbrainz-libxml2.12.patch: Fix build against libxml 2.12. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmusicbrainz.spec ++++++ --- /var/tmp/diff_new_pack.GldRBm/_old 2024-04-21 20:25:48.294671494 +0200 +++ /var/tmp/diff_new_pack.GldRBm/_new 2024-04-21 20:25:48.298671641 +0200 @@ -1,7 +1,7 @@ # # spec file for package libmusicbrainz # -# Copyright (c) 2021 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 @@ -27,6 +27,8 @@ Source1: baselibs.conf # PATCH-FIX-UPSTREAM musicbrainz-cmake-noglob.patch dims...@opensuse.org -- do not use wildcards for dependencies Patch0: musicbrainz-cmake-noglob.patch +# PATCH-FIX-UPSTREAM +Patch1: https://patch-diff.githubusercontent.com/raw/metabrainz/libmusicbrainz/pull/19.patch#/libmusicbrainz-libxml2.12.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: neon-devel ++++++ libmusicbrainz-libxml2.12.patch ++++++ >From 9ba00067a15479a52262a5126bcb6889da5884b7 Mon Sep 17 00:00:00 2001 From: Christopher Degawa <c...@randomderp.com> Date: Sun, 8 Oct 2023 11:41:30 -0500 Subject: [PATCH 1/2] libxml: include parser.h libxml2 removed the inclusion of global.h in a few of its include files, so we can no longer rely on transitive includes. This applies to functions like xmlParseFile. Signed-off-by: Christopher Degawa <c...@randomderp.com> --- src/xmlParser.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/xmlParser.cc b/src/xmlParser.cc index e63df55..53dec25 100644 --- a/src/xmlParser.cc +++ b/src/xmlParser.cc @@ -30,6 +30,7 @@ #include <cstring> #include <libxml/tree.h> +#include <libxml/parser.h> XMLResults::XMLResults() : line(0), >From 558c9ba0e6d702d5c877f75be98176f57abf1b02 Mon Sep 17 00:00:00 2001 From: Christopher Degawa <c...@randomderp.com> Date: Sun, 8 Oct 2023 11:42:55 -0500 Subject: [PATCH 2/2] libxml: constify the storage of xmlGetLastError() libxml2 recently made it a const return. Since nothing is being modified of it, this should have no real effect past satisfying the compiler. Signed-off-by: Christopher Degawa <c...@randomderp.com> --- src/xmlParser.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xmlParser.cc b/src/xmlParser.cc index 53dec25..fee684c 100644 --- a/src/xmlParser.cc +++ b/src/xmlParser.cc @@ -57,7 +57,7 @@ XMLNode *XMLRootNode::parseFile(const std::string &filename, XMLResults* results doc = xmlParseFile(filename.c_str()); if ((doc == NULL) && (results != NULL)) { - xmlErrorPtr error = xmlGetLastError(); + const xmlError *error = xmlGetLastError(); results->message = error->message; results->line = error->line; results->code = error->code; @@ -72,7 +72,7 @@ XMLNode *XMLRootNode::parseString(const std::string &xml, XMLResults* results) doc = xmlParseMemory(xml.c_str(), xml.length()); if ((doc == NULL) && (results != NULL)) { - xmlErrorPtr error = xmlGetLastError(); + const xmlError *error = xmlGetLastError(); results->message = error->message; results->line = error->line; results->code = error->code;
