musicbrainz, prepare for updated neon recipe (#4922)

media-libs/musicbrainz/musicbrainz-5.1.0.recipe

@@ -5,7 +5,7 @@ add MusicBrainz lookup capabilities to their applications."
 HOMEPAGE="http://musicbrainz.org/doc/libmusicbrainz"
 COPYRIGHT="2012 Andrew Hawkins"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.0.tar.gz"
 CHECKSUM_SHA256="6749259e89bbb273f3f5ad7acdffb7c47a2cf8fcaeab4c4695484cef5f4c6b46"
 SOURCE_DIR="libmusicbrainz-$portVersion"

media-libs/musicbrainz/patches/musicbrainz-5.1.0.patchset

@@ -1,11 +1,8 @@
-From 5b985f20b6ac7aafaaccba676aeda2770b0794ed Mon Sep 17 00:00:00 2001
+From 4521b6da9145747ff9d7bc7c2abcc03789ce9045 Mon Sep 17 00:00:00 2001
 From: Theodore Kokkoris <t.kokkoris@gmail.com>
 Date: Sat, 17 Jan 2015 17:23:20 +0200
-Subject: [PATCH 1/4] Add secondary arch suffix to library path
+Subject: Add secondary arch suffix to library path
 
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 384cb65..32770df 100644
@@ -21,16 +18,14 @@ index 384cb65..32770df 100644
  SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE)
  SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH  "Installation prefix for object code libraries" FORCE)
 -- 
-1.8.3.4
+2.26.0
 
-From 43f6063c57e697082e7942248ee471677e157f50 Mon Sep 17 00:00:00 2001
+
+From aac5f1f920de3bd17558ea346861980230973194 Mon Sep 17 00:00:00 2001
 From: Theodore Kokkoris <t.kokkoris@gmail.com>
 Date: Sat, 17 Jan 2015 17:25:04 +0200
-Subject: [PATCH 2/4] Change header installation directory on Haiku
+Subject: Change header installation directory on Haiku
 
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 32770df..a3550a1 100644
@@ -49,17 +44,15 @@ index 32770df..a3550a1 100644
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc)
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
 -- 
-1.8.3.4
+2.26.0
 
-From bb1836b89190990cae7f4ef505824eae6baa61be Mon Sep 17 00:00:00 2001
+
+From a819bba6127d2b806f47caf626990847412b28d7 Mon Sep 17 00:00:00 2001
 From: Theodore Kokkoris <t.kokkoris@gmail.com>
 Date: Sat, 17 Jan 2015 17:25:26 +0200
-Subject: [PATCH 3/4] Remove tests and examples build
+Subject: Remove tests and examples build
 
 Doesn't work with gcc2 (std::boolalpha)
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index a3550a1..4d5fa02 100644
@@ -75,16 +68,14 @@ index a3550a1..4d5fa02 100644
  ADD_CUSTOM_TARGET(docs
  	doxygen
 -- 
-1.8.3.4
+2.26.0
 
-From f980c76455c341b6f97f728709a4e726447f0355 Mon Sep 17 00:00:00 2001
+
+From 107718cba7ae4ae6d77a6c7611ab710e634cbf5a Mon Sep 17 00:00:00 2001
 From: Theodore Kokkoris <t.kokkoris@gmail.com>
 Date: Sat, 17 Jan 2015 17:25:56 +0200
-Subject: [PATCH 4/4] Remove -Wextra (doesn't exist on gcc2)
+Subject: Remove -Wextra (doesn't exist on gcc2)
 
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index c91a565..160d5c0 100644
@@ -100,12 +91,13 @@ index c91a565..160d5c0 100644
  			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
  		ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
 -- 
-1.8.3.4
+2.26.0
 
-From 22d7535c6e9b9fc9b014360333a2dd7e8f497977 Mon Sep 17 00:00:00 2001
+
+From 34a0c58d2ce17eb49ad10ca9a6a6b33055e0d468 Mon Sep 17 00:00:00 2001
 From: Markus Himmel <markus@himmel-villmar.de>
 Date: Sun, 17 Jan 2016 10:47:49 +0100
-Subject: [PATCH] Fix includes of local files in public headers
+Subject: Fix includes of local files in public headers
 
 Usually, when including a header, gcc's "working directory" changes to the
 directory that header is in. When this header includes another header in the
@@ -121,9 +113,6 @@ add the musicbrainz5/ directory as an include path, but this library has files
 such as List.h and Message.h, so there will be chaos.
 
 This commit just fixes the two includes which caused the problem.
----
- include/musicbrainz5/Query.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/musicbrainz5/Query.h b/include/musicbrainz5/Query.h
 index f6e15e3..1e5e013 100644
@@ -142,5 +131,28 @@ index f6e15e3..1e5e013 100644
  #include "musicbrainz5/ReleaseList.h"
  #include "musicbrainz5/Metadata.h"
 -- 
-2.7.0
+2.26.0
+
+
+From deb206a5480558df6321129417bafa50e719540c Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 18 Apr 2020 10:40:38 +0000
+Subject: Don't use -Werror
+
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 160d5c0..a3a2611 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -67,7 +67,7 @@ ENDIF(WIN32)
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic-errors")
+ 		IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
+-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
++			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ 		ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
+ 		#set_source_files_properties(mb5_c.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+-- 
+2.26.0