Add upstream patch to fix build without use taglib wrt bug #484126.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 128 insertions, 2 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index e209472ffd4e..be9f1018498b 100644
--- a/media-sound/cantata/ChangeLog
+++ b/media-sound/cantata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cantata
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.20 2013/09/04 17:36:18 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.21 2013/09/25 18:36:20 johu Exp $
+
+  25 Sep 2013; Johannes Huber <johu@gentoo.org>
+  +files/cantata-1.1.2-no-taglib.patch, cantata-1.1.2.ebuild:
+  Add upstream patch to fix build without use taglib wrt bug #484126.
 
 *cantata-1.1.2 (04 Sep 2013)
 
diff --git a/media-sound/cantata/cantata-1.1.2.ebuild b/media-sound/cantata/cantata-1.1.2.ebuild
index 135db63375eb..a35c3558c4f7 100644
--- a/media-sound/cantata/cantata-1.1.2.ebuild
+++ b/media-sound/cantata/cantata-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.1.2.ebuild,v 1.1 2013/09/04 17:34:51 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.1.2.ebuild,v 1.2 2013/09/25 18:36:20 johu Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
@@ -61,6 +61,8 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep oxygen-icons)
 "
 
+PATCHES=( "${FILESDIR}/${P}-no-taglib.patch" )
+
 src_prepare() {
 	kde4-base_src_prepare
 
diff --git a/media-sound/cantata/files/cantata-1.1.2-no-taglib.patch b/media-sound/cantata/files/cantata-1.1.2-no-taglib.patch
new file mode 100644
index 000000000000..925f987b47e2
--- /dev/null
+++ b/media-sound/cantata/files/cantata-1.1.2-no-taglib.patch
@@ -0,0 +1,120 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(Revision 3296)
++++ CMakeLists.txt	(Revision 3297)
+@@ -55,7 +55,9 @@
+     models/playqueueproxymodel.cpp models/dirviewmodel.cpp models/dirviewproxymodel.cpp models/dirviewitem.cpp models/dirviewitemdir.cpp
+     models/streamsmodel.cpp models/streamsproxymodel.cpp models/albumsmodel.cpp models/albumsproxymodel.cpp models/proxymodel.cpp
+     models/actionmodel.cpp models/digitallyimported.cpp models/streamsearchmodel.cpp models/musiclibraryitem.cpp models/musicmodel.cpp
+-    models/multimusicmodel.cpp
++    models/multimusicmodel.cpp models/onlineservicesmodel.cpp
++    online/onlineservicespage.cpp online/onlineservice.cpp online/jamendoservice.cpp online/jamendosettingsdialog.cpp
++    online/magnatuneservice.cpp online/magnatunesettingsdialog.cpp online/soundcloudservice.cpp
+     mpd/mpdconnection.cpp mpd/mpdparseutils.cpp mpd/mpdstats.cpp mpd/mpdstatus.cpp mpd/song.cpp mpd/mpduser.cpp mpd/cuefile.cpp
+     dynamic/dynamic.cpp dynamic/dynamicpage.cpp dynamic/dynamicproxymodel.cpp dynamic/dynamicruledialog.cpp dynamic/dynamicrulesdialog.cpp
+     widgets/treeview.cpp widgets/listview.cpp widgets/itemview.cpp widgets/autohidingsplitter.cpp widgets/timeslider.cpp
+@@ -76,7 +78,10 @@
+     streams/streamspage.h streams/streamdialog.h streams/streamfetcher.h streams/digitallyimportedsettings.h
+     models/musiclibrarymodel.h models/musiclibraryproxymodel.h models/playlistsmodel.h models/playlistsproxymodel.h models/playqueuemodel.h
+     models/playqueueproxymodel.h models/dirviewmodel.h models/dirviewproxymodel.h models/albumsmodel.h models/streamsmodel.h
+-    models/actionmodel.h models/digitallyimported.h models/streamsearchmodel.h models/multimusicmodel.h
++    models/actionmodel.h models/digitallyimported.h models/streamsearchmodel.h models/multimusicmodel.h models/onlineservicesmodel.h
++    online/onlineservice.h online/onlineservicespage.h online/jamendoservice.h online/magnatuneservice.h
++    online/magnatunesettingsdialog.h online/magnatuneservice.h online/magnatunesettingsdialog.h
++    online/soundcloudservice.h
+     mpd/mpdconnection.h mpd/mpdstats.h mpd/mpdstatus.h
+     dynamic/dynamic.h dynamic/dynamicpage.h dynamic/dynamicruledialog.h dynamic/dynamicrulesdialog.h
+     widgets/treeview.h widgets/listview.h widgets/itemview.h widgets/autohidingsplitter.h widgets/timeslider.h widgets/actionlabel.h
+@@ -93,7 +98,8 @@
+     streams/streamspage.ui streams/digitallyimportedsettings.ui
+     dynamic/dynamicpage.ui dynamic/dynamicrule.ui dynamic/dynamicrules.ui
+     context/togglelist.ui context/othersettings.ui
+-    widgets/itemview.ui)
++    widgets/itemview.ui
++    online/onlineservicespage.ui)
+ 
+ if (ENABLE_TAGLIB)
+     set(TAGLIB_MIN_VERSION "1.6")
+@@ -123,23 +129,15 @@
+     set(CANTATA_SRCS ${CANTATA_SRCS}
+         tags/tageditor.cpp tags/trackorganiser.cpp tags/tags.cpp
+         devices/filenameschemedialog.cpp
+-        http/httpserversettings.cpp http/httpserver.cpp http/httpsocket.cpp
+-        online/onlineservicespage.cpp online/onlineservice.cpp online/jamendoservice.cpp online/jamendosettingsdialog.cpp
+-        online/magnatuneservice.cpp online/magnatunesettingsdialog.cpp online/soundcloudservice.cpp online/onlinedevice.cpp
+-        models/onlineservicesmodel.cpp)
++        http/httpserversettings.cpp http/httpserver.cpp http/httpsocket.cpp)
+     set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS}
+         tags/tageditor.h tags/trackorganiser.h
+         http/httpserversettings.h http/httpsocket.h
+-        devices/filenameschemedialog.h devices/device.h
+-        online/onlineservice.h online/onlineservicespage.h online/jamendoservice.h online/magnatuneservice.h
+-        online/magnatunesettingsdialog.h online/onlinedevice.h online/magnatuneservice.h online/magnatunesettingsdialog.h
+-        online/onlinedevice.h online/soundcloudservice.h
+-        models/onlineservicesmodel.h)
++        devices/filenameschemedialog.h devices/device.h)
+     set(CANTATA_UIS ${CANTATA_UIS}
+         http/httpserversettings.ui
+         tags/tageditor.ui tags/trackorganiser.ui
+-        devices/filenameschemedialog.ui
+-         online/onlineservicespage.ui)
++        devices/filenameschemedialog.ui)
+ endif (TAGLIB_FOUND)
+ 
+ if (NOT WIN32)
+@@ -323,11 +321,13 @@
+                 devices/device.cpp devices/fsdevice.cpp devices/umsdevice.cpp
+                 models/devicesmodel.cpp tags/filetyperesolver.cpp devices/actiondialog.cpp devices/devicepropertieswidget.cpp
+                 devices/devicepropertiesdialog.cpp devices/encoders.cpp devices/freespaceinfo.cpp
+-                devices/transcodingjob.cpp devices/valueslider.cpp devices/syncdialog.cpp devices/synccollectionwidget.cpp)
++                devices/transcodingjob.cpp devices/valueslider.cpp devices/syncdialog.cpp devices/synccollectionwidget.cpp
++                online/onlinedevice.cpp)
+         set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/devicespage.h devices/filejob.h
+                 devices/fsdevice.h devices/umsdevice.h models/devicesmodel.h
+                 devices/actiondialog.h devices/devicepropertieswidget.h devices/devicepropertiesdialog.h
+-                devices/transcodingjob.h devices/valueslider.h devices/syncdialog.h devices/synccollectionwidget.h)
++                devices/transcodingjob.h devices/valueslider.h devices/syncdialog.h devices/synccollectionwidget.h
++                online/onlinedevice.h)
+         set(CANTATA_UIS ${CANTATA_UIS} devices/devicespage.ui devices/actiondialog.ui devices/devicepropertieswidget.ui
+                 devices/synccollectionwidget.ui)
+ 
+@@ -567,7 +567,6 @@
+ else (TAGLIB_FOUND)
+ 
+     message("      Disabled features:")
+-    message("        - Online services (Jamendo and Magnatune)(tag lib required)")
+     if (NOT PHONON_FOUND)
+         message("        - MPD HTTP stream playback (phonon required)")
+     endif (NOT PHONON_FOUND)
+Index: models/onlineservicesmodel.cpp
+===================================================================
+--- models/onlineservicesmodel.cpp	(Revision 3296)
++++ models/onlineservicesmodel.cpp	(Revision 3297)
+@@ -378,6 +378,7 @@
+     return mimeData;
+ }
+ 
++#ifdef TAGLIB_FOUND
+ Device * OnlineServicesModel::device(const QString &udi)
+ {
+     if (!dev) {
+@@ -386,3 +387,5 @@
+     dev->setData(udi.mid(constUdiPrefix.length()));
+     return dev;
+ }
++#endif
++
+Index: models/onlineservicesmodel.h
+===================================================================
+--- models/onlineservicesmodel.h	(Revision 3296)
++++ models/onlineservicesmodel.h	(Revision 3297)
+@@ -57,7 +57,9 @@
+     void stop();
+     QMimeData * mimeData(const QModelIndexList &indexes) const;
+     void setSearch(const QString &serviceName, const QString &text);
++    #ifdef TAGLIB_FOUND
+     Device *device(const QString &udi);
++    #endif
+     Action * configureAct() const { return configureAction; }
+     Action * refreshAct() const { return refreshAction; }
+