Bug#791880: cantata: FTBFS with libmusicbrainz5 from experimental

[Sebastian Ramacher]

Package: cantata
Version: 1.5.2.ds2-1
Severity: important
Tags: patch sid stretch

cantata fails to build against libmusicbrainz5 from experimental which split the
C and C++ interface into different shared libraries. Since cantata uses the C++
interface it needs to link against libmusicbrainz5cc now.

The attached patch fixes this issue.

Cheers
-- 
Sebastian Ramacher
-------------- next part --------------
diff -Nru cantata-1.5.2.ds2/debian/changelog cantata-1.5.2.ds2/debian/changelog
--- cantata-1.5.2.ds2/debian/changelog	2015-04-26 17:14:42.000000000 +0200
+++ cantata-1.5.2.ds2/debian/changelog	2015-07-09 10:27:54.000000000 +0200
@@ -1,3 +1,10 @@
+cantata (1.5.2.ds2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Look for libmusicbrainz5cc instead of libmusicbrainz5.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Thu, 09 Jul 2015 10:27:13 +0200
+
 cantata (1.5.2.ds2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru cantata-1.5.2.ds2/debian/control cantata-1.5.2.ds2/debian/control
--- cantata-1.5.2.ds2/debian/control	2015-04-26 17:14:42.000000000 +0200
+++ cantata-1.5.2.ds2/debian/control	2015-07-09 10:28:24.000000000 +0200
@@ -12,7 +12,7 @@
                libavutil-dev,
                libcdparanoia-dev,
                libebur128-dev,
-               libmusicbrainz5-dev,
+               libmusicbrainz5-dev (>= 5.1.0+git20150707),
                libmpg123-dev,
                libmtp-dev (>= 1.0.0),
                libphonon-dev,
diff -Nru cantata-1.5.2.ds2/debian/patches/libmusicbrainz5cc.patch cantata-1.5.2.ds2/debian/patches/libmusicbrainz5cc.patch
--- cantata-1.5.2.ds2/debian/patches/libmusicbrainz5cc.patch	1970-01-01 01:00:00.000000000 +0100
+++ cantata-1.5.2.ds2/debian/patches/libmusicbrainz5cc.patch	2015-07-09 10:29:18.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Look for libmusicbrainz5cc instead of libmusicbrainz5.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2015-07-09
+
+--- cantata-1.5.2.ds2.orig/cmake/FindMusicBrainz5.cmake
++++ cantata-1.5.2.ds2/cmake/FindMusicBrainz5.cmake
+@@ -16,10 +16,10 @@ endif(MUSICBRAINZ5_INCLUDE_DIRS AND MUSI
+ 
+ IF (NOT WIN32)
+    find_package(PkgConfig)
+-   PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5 )
++   PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5cc )
+ ELSE (NOT WIN32)
+   FIND_PATH( MUSICBRAINZ5_INCLUDE_DIRS musicbrainz5/Disc.h )
+-  FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5 )
++  FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5cc )
+ ENDIF (NOT WIN32)
+ 
+ include(FindPackageHandleStandardArgs)
diff -Nru cantata-1.5.2.ds2/debian/patches/series cantata-1.5.2.ds2/debian/patches/series
--- cantata-1.5.2.ds2/debian/patches/series	2015-04-26 17:14:42.000000000 +0200
+++ cantata-1.5.2.ds2/debian/patches/series	2015-07-09 10:28:57.000000000 +0200
@@ -1,3 +1,4 @@
 # only needed for Qt in wheezy
 #playeradaptor.patch
 ebur128-location.patch
+libmusicbrainz5cc.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20150709/c8fab82a/attachment-0001.sig>