[packages/libmusicbrainz] Rel 9

[arekm]

commit 6eadd6975922b192feb6b123c44e6cafa9b651c8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 15 11:45:32 2026 +0100

    Rel 9

 libmusicbrainz-gcc15.patch | 69 ++++++++++++++++++++++++++++++++++++++++++++++
 libmusicbrainz-gcc43.patch |  8 +++---
 libmusicbrainz.spec        |  4 ++-
 3 files changed, 76 insertions(+), 5 deletions(-)
---
diff --git a/libmusicbrainz.spec b/libmusicbrainz.spec
index bff7f6f..4205920 100644
--- a/libmusicbrainz.spec
+++ b/libmusicbrainz.spec
@@ -2,7 +2,7 @@ Summary:	A software library for accesing MusicBrainz servers
 Summary(pl.UTF-8):	Biblioteka umożliwiająca korzystanie z serwerów MusicBrainz
 Name:		libmusicbrainz
 Version:	2.1.5
-Release:	8
+Release:	9
 Epoch:		1
 License:	LGPL v2.1+
 Group:		Libraries
@@ -10,6 +10,7 @@ Source0:	http://ftp.musicbrainz.org/pub/musicbrainz/historical/%{name}-%{version
 # Source0-md5:	d5e19bb77edd6ea798ce206bd05ccc5f
 Patch0:		%{name}-gcc43.patch
 Patch1:		%{name}-narrowing.patch
+Patch2:		%{name}-gcc15.patch
 URL:		https://musicbrainz.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -81,6 +82,7 @@ Wiązania Pythona do libmusicbrainz.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 %build
 %{__libtoolize}
diff --git a/libmusicbrainz-gcc15.patch b/libmusicbrainz-gcc15.patch
new file mode 100644
index 0000000..a42bf93
--- /dev/null
+++ b/libmusicbrainz-gcc15.patch
@@ -0,0 +1,69 @@
+--- libmusicbrainz-2.1.5.orig/lib/diskid.h	2006-11-14 17:34:49.000000000 +0100
++++ libmusicbrainz-2.1.5/lib/diskid.h	2026-03-15 11:29:34.786485442 +0100
+@@ -57,14 +57,14 @@
+ //  cdinfo struct 
+ //
+ 
+-typedef	unsigned char byte;
+-typedef unsigned long dword;
++typedef	unsigned char mb_byte;
++typedef unsigned long mb_dword;
+ 
+ typedef struct {
+-    byte FirstTrack;         // The first track on CD : normally 1
+-    byte LastTrack;          // The last track on CD: max number 99
++    mb_byte FirstTrack;         // The first track on CD : normally 1
++    mb_byte LastTrack;          // The last track on CD: max number 99
+     
+-    dword FrameOffset[100];  // Track 2 is TrackFrameOffset[2] etc.
++    mb_dword FrameOffset[100];  // Track 2 is TrackFrameOffset[2] etc.
+                              // Leadout Track will be TrackFrameOffset[0]
+ 
+ } MUSICBRAINZ_CDINFO, *PMUSICBRAINZ_CDINFO; 
+@@ -96,7 +96,7 @@
+ 
+         void  TestGenerateId();
+         void  GenerateId(PMUSICBRAINZ_CDINFO pCDInfo, char DiscId[33]);
+-        void  ReportError(char *err);
++        void  ReportError(const char *err);
+         Error FillCDInfo(const string &device, MUSICBRAINZ_CDINFO &cdinfo);
+         const string &MakeString(int i);
+ 
+--- libmusicbrainz-2.1.5.orig/lib/diskid.cpp	2006-11-15 10:54:32.000000000 +0100
++++ libmusicbrainz-2.1.5/lib/diskid.cpp	2026-03-15 11:29:34.788529974 +0100
+@@ -46,7 +46,7 @@
+ {
+ }
+ 
+-void DiskId::ReportError(char *err)
++void DiskId::ReportError(const char *err)
+ {
+    m_errorMsg = string(err);
+ }
+--- libmusicbrainz-2.1.5.orig/osdep/mb_linux.h	2006-11-14 17:34:51.000000000 +0100
++++ libmusicbrainz-2.1.5/osdep/mb_linux.h	2026-03-15 11:29:22.452620258 +0100
+@@ -35,7 +35,7 @@
+ 
+ #include <linux/cdrom.h>
+ 
+-typedef char* MUSICBRAINZ_DEVICE;
++typedef const char* MUSICBRAINZ_DEVICE;
+ 
+ 
+ 
+--- libmusicbrainz-2.1.5.orig/lib/rdfextract.cpp	2006-11-14 17:34:49.000000000 +0100
++++ libmusicbrainz-2.1.5/lib/rdfextract.cpp	2026-03-15 11:29:27.190101902 +0100
+@@ -63,10 +63,10 @@
+    RDF_SetBase(parser, "musicbrainz");
+    if (!RDF_Parse(parser, rdfDocument.c_str(), rdfDocument.length(), 1))
+    {
+-       char line[10];
++       char line[32];
+ 
+-       sprintf(line, " on line %d.",
+-               XML_GetCurrentLineNumber(RDF_GetXmlParser(parser)));
++       sprintf(line, " on line %ld.",
++               (long)XML_GetCurrentLineNumber(RDF_GetXmlParser(parser)));
+        error = string("Error: ") + 
+                string(XML_ErrorString(XML_GetErrorCode(
+                       RDF_GetXmlParser(parser)))) +
diff --git a/libmusicbrainz-gcc43.patch b/libmusicbrainz-gcc43.patch
index b7466b8..8af4dd8 100644
--- a/libmusicbrainz-gcc43.patch
+++ b/libmusicbrainz-gcc43.patch
@@ -26,8 +26,8 @@ diff -urN libmusicbrainz-2.1.5/lib/c_wrapper.cpp libmusicbrainz-2.1.5.new/lib/c_
 --- libmusicbrainz-2.1.5/lib/c_wrapper.cpp	2006-11-14 17:34:49.000000000 +0100
 +++ libmusicbrainz-2.1.5.new/lib/c_wrapper.cpp	2008-10-18 14:03:08.000000000 +0200
 @@ -21,6 +21,8 @@
-      $Id$
- 
+      $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
+
  ----------------------------------------------------------------------------*/
 +#include <cstring>
 +
@@ -38,8 +38,8 @@ diff -urN libmusicbrainz-2.1.5/lib/http.cpp libmusicbrainz-2.1.5.new/lib/http.cp
 --- libmusicbrainz-2.1.5/lib/http.cpp	2007-05-11 08:21:21.000000000 +0200
 +++ libmusicbrainz-2.1.5.new/lib/http.cpp	2008-10-18 14:05:44.000000000 +0200
 @@ -22,6 +22,7 @@
-      $Id$
- 
+      $Id: http.cpp 9128 2007-05-11 06:21:20Z luks $
+
  ----------------------------------------------------------------------------*/
 +#include <cstring>
  #include <stdlib.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmusicbrainz.git/commitdiff/6eadd6975922b192feb6b123c44e6cafa9b651c8