[packages/libmusicbrainz] - added narrowing patch (fix build with modern gcc) - drop .la file - release 8

[qboosh]

commit 8aa9ca2fcdaaab7b266c93ad6c7ba3e464b39cde
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Nov 24 21:17:56 2020 +0100

    - added narrowing patch (fix build with modern gcc)
    - drop .la file
    - release 8

 libmusicbrainz-narrowing.patch | 50 ++++++++++++++++++++++++++++++++++++++++++
 libmusicbrainz.spec            | 13 ++++++-----
 2 files changed, 58 insertions(+), 5 deletions(-)
---
diff --git a/libmusicbrainz.spec b/libmusicbrainz.spec
index a9236b0..db8af20 100644
--- a/libmusicbrainz.spec
+++ b/libmusicbrainz.spec
@@ -2,13 +2,14 @@ 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:	7
+Release:	8
 Epoch:		1
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.musicbrainz.org/pub/musicbrainz/historical/%{name}-%{version}.tar.gz
 # Source0-md5:	d5e19bb77edd6ea798ce206bd05ccc5f
 Patch0:		%{name}-gcc43.patch
+Patch1:		%{name}-narrowing.patch
 URL:		https://musicbrainz.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -79,6 +80,7 @@ Wiązania Pythona do libmusicbrainz.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -104,6 +106,9 @@ cd ..
 
 %py_postclean
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmusicbrainz.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,15 +117,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README TODO
+%doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_libdir}/libmusicbrainz.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmusicbrainz.so.4
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog
 %attr(755,root,root) %{_libdir}/libmusicbrainz.so
-%{_libdir}/libmusicbrainz.la
 %{_includedir}/musicbrainz
 %{_pkgconfigdir}/libmusicbrainz.pc
 
diff --git a/libmusicbrainz-narrowing.patch b/libmusicbrainz-narrowing.patch
new file mode 100644
index 0000000..3a1c621
--- /dev/null
+++ b/libmusicbrainz-narrowing.patch
@@ -0,0 +1,50 @@
+--- libmusicbrainz-2.1.5/lib/signature.cpp.orig	2006-11-14 17:34:49.000000000 +0100
++++ libmusicbrainz-2.1.5/lib/signature.cpp	2020-11-24 21:09:36.749017364 +0100
+@@ -45,6 +45,7 @@
+    typedef long long llong;
+ #endif
+ 
++unsigned
+ char silenceTRM[] = { 0x7d, 0x15, 0x4f, 0x52, 0xb5, 0x36, 0x4f, 0xae, 
+                       0xb5, 0x8b, 0x06, 0x66, 0x82, 0x6c, 0x2b, 0xac, 0x00 };
+ 
+@@ -443,7 +444,7 @@
+ {
+     if (m_numBytesWritten < 2)
+     {
+-        strGUID = string(silenceTRM);
++        strGUID = string(reinterpret_cast<const char*>(silenceTRM));
+         return 0;
+     }
+ 
+--- libmusicbrainz-2.1.5/lib/sigclient.cpp.orig	2020-11-24 21:06:49.516590007 +0100
++++ libmusicbrainz-2.1.5/lib/sigclient.cpp	2020-11-24 21:14:26.010783632 +0100
+@@ -40,8 +40,10 @@
+ 
+ #include "sigxdr.h"
+ 
++unsigned
+ char tooShortTRM[] = { 0xf9, 0x80, 0x9a, 0xb1, 0x2b, 0x0f, 0x4d, 0x78, 
+                        0x88, 0x62, 0xfb, 0x42, 0x5a, 0xde, 0x8a, 0xb9 };
++unsigned
+ char sigserverBusyTRM[] = { 0xc4, 0x57, 0xa4, 0xa8, 0xb3, 0x42, 0x4e, 0xc9, 
+                             0x8f, 0x13, 0xb6, 0xbd, 0x26, 0xc0, 0xe4, 0x00 };
+ 
+@@ -128,7 +130,7 @@
+     if (ret == -2)
+     {
+         ret = 0;
+-        strGUID = sigserverBusyTRM;
++        strGUID = reinterpret_cast<const char*>(sigserverBusyTRM);
+     }
+     else
+     if ((ret != -1) && (nBytes == iGUIDSize)) {
+@@ -136,7 +138,7 @@
+         if (memcmp(pBuffer, pBlank, nBytes))
+             strGUID = converter.ToStrGUID(pBuffer, nBytes);
+         else
+-            strGUID = tooShortTRM;
++            strGUID = reinterpret_cast<const char*>(tooShortTRM);
+ 
+         if (strGUID == "") 
+         {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmusicbrainz.git/commitdiff/8aa9ca2fcdaaab7b266c93ad6c7ba3e464b39cde