[jhbuild] 3.6: Add libmusicbrainz 5.0

[Bastien Nocera <hadess src gnome org>]

commit 537a315d86743fb674cfc461801f8668bdf75af0
Author: Bastien Nocera <hadess hadess net>
Date:   Thu May 24 16:17:01 2012 +0100

    3.6: Add libmusicbrainz 5.0
    
    And rename libmusicbrainz 4.x to libmusicbrainz4

 modulesets/gnome-apps-3.6.modules                  |    4 +-
 modulesets/gnome-suites-core-3.6.modules           |    2 +-
 modulesets/gnome-suites-core-deps-base-3.6.modules |   16 ++++++++++-
 patches/libmusicbrainz5-werror-compile-fix.patch   |   30 ++++++++++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index 586c525..b53c672 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -1124,7 +1124,7 @@
     <suggests>
       <dep package="libgnome-keyring"/>
       <dep package="avahi"/>
-      <dep package="libmusicbrainz"/>
+      <dep package="libmusicbrainz4"/>
       <dep package="brasero"/>
       <dep package="libdmapsharing"/>
       <dep package="vala"/>
@@ -1177,7 +1177,7 @@
       <dep package="gst-plugins-good"/>
       <dep package="libgnome-media-profiles"/>
       <dep package="brasero"/>
-      <dep package="libmusicbrainz"/>
+      <dep package="libmusicbrainz4"/>
       <dep package="libcanberra"/>
     </dependencies>
   </autotools>
diff --git a/modulesets/gnome-suites-core-3.6.modules b/modulesets/gnome-suites-core-3.6.modules
index ea938dc..ca78aa7 100644
--- a/modulesets/gnome-suites-core-3.6.modules
+++ b/modulesets/gnome-suites-core-3.6.modules
@@ -772,7 +772,7 @@
       <dep package="intltool"/>
       <dep package="gobject-introspection"/>
       <dep package="gjs"/>
-      <dep package="libmusicbrainz"/>
+      <dep package="libmusicbrainz4"/>
       <dep package="evince"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
diff --git a/modulesets/gnome-suites-core-deps-base-3.6.modules b/modulesets/gnome-suites-core-deps-base-3.6.modules
index d2eec9e..8d261b8 100644
--- a/modulesets/gnome-suites-core-deps-base-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.6.modules
@@ -300,7 +300,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libmusicbrainz"
+  <cmake id="libmusicbrainz4"
          cmakeargs="-DLIB_SUFFIX=${libsuffix}">
     <pkg-config>libmusicbrainz4.pc</pkg-config>
     <branch repo="github.com/metabrainz"
@@ -313,6 +313,20 @@
     </dependencies>
   </cmake>
 
+  <cmake id="libmusicbrainz"
+         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
+    <pkg-config>libmusicbrainz5.pc</pkg-config>
+    <branch repo="github.com/metabrainz"
+            module="libmusicbrainz/libmusicbrainz-5.0.0.tar.gz"
+            version="5.0.0"
+            hash="sha256:8479063ad3decad11c71d91926226c9f43aaabbf82cb0944eda749c1f44e3006"
+            size="109143">
+      <patch file="libmusicbrainz5-werror-compile-fix.patch" strip="1"/>
+    </branch>
+    <dependencies>
+    </dependencies>
+  </cmake>
+
   <tarball id="libnice" version="0.1.2" autogenargs="--enable-gupnp">
     <pkg-config>nice.pc</pkg-config>
     <source href="http://nice.freedesktop.org/releases/libnice-0.1.2.tar.gz";
diff --git a/patches/libmusicbrainz5-werror-compile-fix.patch b/patches/libmusicbrainz5-werror-compile-fix.patch
new file mode 100644
index 0000000..373a3c8
--- /dev/null
+++ b/patches/libmusicbrainz5-werror-compile-fix.patch
@@ -0,0 +1,30 @@
+From 0dba908e548373d598e06f6a92bc4ac2af09cc58 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess hadess net>
+Date: Thu, 24 May 2012 16:12:49 +0100
+Subject: [PATCH] Fix broken compilation from tarball
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+-Werror in release tarballs? Really?
+libmusicbrainz-5.0.0/tests/ctest.c: In function âCompileTestâ:
+libmusicbrainz-5.0.0/tests/ctest.c:276:19: error: variable âSecondaryTypeâ set but not used [-Werror=unused-but-set-variable]
+---
+ tests/ctest.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/ctest.c b/tests/ctest.c
+index 66ae4f7..4284292 100644
+--- a/tests/ctest.c
++++ b/tests/ctest.c
+@@ -777,6 +777,7 @@ void CompileTest()
+ 
+ 	DummyInt=mb5_secondarytype_list_size(SecondaryTypeList);
+ 	SecondaryType=mb5_secondarytype_list_item(SecondaryTypeList,0);
++	SecondaryType=SecondaryType;
+ 	ReleaseGroupList=mb5_secondarytype_list_clone(SecondaryTypeList);
+ 	DummyInt=mb5_secondarytype_list_get_count(SecondaryTypeList);
+ 	DummyInt=mb5_secondarytype_list_get_offset(SecondaryTypeList);
+-- 
+1.7.10.1
+