Thu Feb 1 08:50:01 2024 UTC (112d)
libmusicbrainz5: fix build with libxml2 2.12


(wiz)
diff -r1.5 -r1.6 pkgsrc/audio/libmusicbrainz5/distinfo
diff -r0 -r1.1 pkgsrc/audio/libmusicbrainz5/patches/patch-src_xmlParser.cc
cvs diff -r1.5 -r1.6 pkgsrc/audio/libmusicbrainz5/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libmusicbrainz5/distinfo 2021/10/26 09:59:08 1.5
+++ pkgsrc/audio/libmusicbrainz5/distinfo 2024/02/01 08:50:01 1.6
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 09:59:08 nia Exp $ 1$NetBSD: distinfo,v 1.6 2024/02/01 08:50:01 wiz Exp $
2 2
3BLAKE2s (libmusicbrainz-5.1.0.tar.gz) = 519cc6e0329d06bbc2648c574f26fd8faa4ed8a378b7cf24d54a527354c288c6 3BLAKE2s (libmusicbrainz-5.1.0.tar.gz) = 519cc6e0329d06bbc2648c574f26fd8faa4ed8a378b7cf24d54a527354c288c6
4SHA512 (libmusicbrainz-5.1.0.tar.gz) = daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03 4SHA512 (libmusicbrainz-5.1.0.tar.gz) = daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
5Size (libmusicbrainz-5.1.0.tar.gz) = 77220 bytes 5Size (libmusicbrainz-5.1.0.tar.gz) = 77220 bytes
 6SHA1 (patch-src_xmlParser.cc) = 19bd9504e451e09d81b740802ac4b36c9ed6c20a
File Added: pkgsrc/audio/libmusicbrainz5/patches/patch-src_xmlParser.cc
$NetBSD: patch-src_xmlParser.cc,v 1.1 2024/02/01 08:50:01 wiz Exp $

Fix build with libxml2 2.12.
https://github.com/metabrainz/libmusicbrainz/commit/9ba00067a15479a52262a5126bcb6889da5884b7
https://github.com/metabrainz/libmusicbrainz/commit/558c9ba0e6d702d5c877f75be98176f57abf1b02

--- src/xmlParser.cc.orig	2024-02-01 08:48:39.967034933 +0000
+++ src/xmlParser.cc
@@ -30,6 +30,7 @@
 
 #include <cstring>
 #include <libxml/tree.h>
+#include <libxml/parser.h>
 
 XMLResults::XMLResults()
     : line(0),
@@ -56,7 +57,7 @@ XMLNode *XMLRootNode::parseFile(const st
 
     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;
@@ -71,7 +72,7 @@ XMLNode *XMLRootNode::parseString(const 
 
     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;