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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 138 insertions, 11 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/Manifest b/media-sound/cantata/Manifest
index c503e4fb32a4..2fc1faa322e3 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -3,20 +3,21 @@ Hash: SHA256
 
 AUX cantata-1.0.3-audiocd-automagic.patch 1689 SHA256 8b4dfdc7c1c853143e6dd596496d545dcb07080948c8afdbe9d3691c2ee68a92 SHA512 0e18db874cf089e39ae91dcd2322afdb613ba7339dd02158e486044cf3feece357ab4e3f5314d542b3ad0e7f67195850f647a2b88f31ec7b651c1bf0c5ad23d1 WHIRLPOOL 3210fefb76709663171b32555e3659e61f5f7d808cca949c1b8d719cc4732570ef47f7f72f2b48cf368dc0fcbea038ec1e2c2c0aea9e72906e052b4251a45dd5
 AUX cantata-1.0.3-system-qjson.patch 1016 SHA256 b9bcaf3372b0092fe98438b6d1ff8a28518754892ff6d20a2c26177a802cb5c1 SHA512 dbf52a25dbd016131e1606206ca1affe7d6483a549ef1de93af5dbfd1b17384f1cde03cfe98cd8d0516d2ebaae3db4a7492d0b27203ef04e8621c25e909ee1a8 WHIRLPOOL 2add549138ffdacb2d77d185b2e21c51dd12c200ceda8030e7ff8c78a32de7395149d6eaf45e234ad1acbebbfc8028fb3f92e31a196c5c845a39df1b76127090
+AUX cantata-1.1.2-no-taglib.patch 6957 SHA256 6e957dad5734be0b55ed67cf2e29e1fa25d1a6e1579b5f780352b880175a33f0 SHA512 f62f0acd07a704474e21cd2eb4e9bd2152436f75ff8fd072ab68efc46c0e498e84a572fd15152849603df3437108827b64eec8c12102c7d979c8127a3c199368 WHIRLPOOL 6fb49eec59e12c1f7ae5b3463ec0a9f56688b90677efe96ed6a044b4f224943beec1234ec26fc5dff6be2319a6f2dce29cc862fc0afd91bc570e6522a94320cf
 DIST cantata-1.0.3.tar.bz2 1296129 SHA256 853dc62b9cdf6ffbf554f094c4836511ccfadeaa8e056fc23b5308b95322d135 SHA512 23fc6cc1c1e27ef04b299d7dacf1b3bf31a4731b9e7ad52e24a062a5367a9f2ec713ce90a9af4ee4029c06207771847b57eea4bb1326f789295241be2b96546b WHIRLPOOL f8155b056223ca49d7f8d860f6caf1263d8ba7b92d550813464aa2c2e0e76483ee08d9a15f0fecd5a5268d0e3e075af1c9c0d4bbbe188ec6352b339d65236fa4
 DIST cantata-1.1.2.tar.bz2 1127191 SHA256 b860320897e56cd6b92a0f413f71d9842c992fea196999b04c2fe22241bb3dda SHA512 964b4d0218d1a51dc8845ca00b566eeb805d3e71a9ab7e898e05e7bf9dd3a20d1ada8ffa13cd0fb3da9c4af909bd9a7481613a3d50188d3d127979362bb93940 WHIRLPOOL 9027a3cc17e0c38bf1c41c48be3df7550e55de982a9ef39e29ca4d33bd35c70c609376e9f472eec364bf975376594908cf3ddec64c81a0b88ef4e0b4d03e02f5
 EBUILD cantata-1.0.3.ebuild 2291 SHA256 745e1ce2f878c45516797d7b55b51228c9ca2e31d16c45bb606489cd579fe28f SHA512 a292577d3be694aa1aefa3526ffcd9157296186e71849b560e5092378a9fc5accbfb3810e945de2f4e0f0d622a0452d2bcd469d037889dcd5ab4bf3172a49b73 WHIRLPOOL 50d4cf79080b7bc858e39cf3beda9573191bf16428b6f2269e32b91b5550cd84a2f0c1cfbe6628bcfa0726cde52fac27cf6ba219ac8cf24b966217ebb7234f26
-EBUILD cantata-1.1.2.ebuild 2247 SHA256 d42192102d0c8dbd93b311607805ba5447e0fd374dd75f7abb6d5e52acca03f0 SHA512 30a3ebe8aec8c2468350ce547a0c2c54b6711683ca5cd4fe2fdd853867ed54d6d3542e16fd5d3efd51e7b49faef3697fd46a53515be67d5dd45d6c093255fb32 WHIRLPOOL 7f4c7b46f57c2e9929fc9cfa3af7fe5216e926ee2ff46bdb0e7e2ca169ea4701ed2bf9af5e35eff3f0d46c879641d45160a0e8d29132bf936e4283c4b5fec352
-MISC ChangeLog 3269 SHA256 c4ff82cc3a1141d72f3b2db7e81abffc381716af8c6169aaf4511e894c9e4e2f SHA512 3ad223e8af35ff25ab6be43c7e6c2b88fbaef6d617005a931e918b9bdcd588d514c38a75347aab438c4af75a8c57cf2e8ac08a9393735627024288f8dce809f9 WHIRLPOOL 0bf3b19a3af4a206ead50d8223e6fd7f432158778ce7efffd56e955361c7c6cb3fa8f825f737060852d763abbb3badeec7c28ef5405134c2f224c625f06e80bf
+EBUILD cantata-1.1.2.ebuild 2289 SHA256 2820c29d53f44692295c5b10d132fdda18f6fda5a6f7a2a8418d8592ed8077b0 SHA512 0ad65c1c9510a72c62543a68ce6ffee82c97d4bd5560cb99bc9677635a25d231fa9a8af56b9fb263215033cc6731daf432359712ab397a4a2f56bf0e35cc612d WHIRLPOOL 2a55466ee202f5812f3a8ffb606e49c98801eb7fe20b92a413f490e86a6cad05f19ffa197a9793e2dbf0a30c4fa3b5aae1605943559618b141e847c4e52fc3f6
+MISC ChangeLog 3444 SHA256 aa415bbd07de6d2487a2cc3dac59aece7b08387e1f26b9c915e742918e961c7f SHA512 bd6d4672a5787d98b105ee5f8a1a4df7929b9f15dc6846b6b2648414fa0ced85cc0a72d42808302feb7c9fc1f3c8034cbb4ebb5ca34c07667021927db86eedd9 WHIRLPOOL d46b069c4dce94e2555ebdf4d79b16e3ac038ba0af95d23e0ec2575b5a55424445c2fee03b8222e3e138884fdec98292fe69e7c253a1de90140bd08a8b38474e
 MISC metadata.xml 434 SHA256 804413b6e9de114e65f10a8a78c553c4f767f0d970a49e4d970130c6ce46cbe1 SHA512 2d63240be9de57d50998cde7a3b3716e2cfa281c6678fe521bccd96a21b711d933cd3350a54a6bee7083b89184152b7773d6b25cd5b06acf64ab551e4a5b9da5 WHIRLPOOL 620f7caa0e70214629d02da4e65d63c23613a14c4df9035a27eb87f74b04207e58bfd481a5ce29ece815aa27c6cedad1eb820e3dfc438182cc292abcef243f20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSJ277AAoJEMbwO6tnXQ0sKLUH/2tJ4WCWkkyMpnVoLE17DAF+
-kpXzhaABO1r3wEQv0LCqDzWoiL/A6NsgHwulRJs0hG2StWPa1ovWdM19uHEQPXHj
-t9nWCoTX9T0oHVNJEKfeSymP4mvdPQhGWY/CZG3bI3iASeLZMwsgdynQGDW8PbpD
-TMUPwBeHPig2A9Gz+KPRZmg8is0HF9J+q+UgcrAN162h+z8ueQy6K7Oy7A7+tCGK
-px0s5/Yk/k5940uD6hKALSHpySbcGzSQ9BDOnzZlOLpJlZEIpCiQwr4gW3pDrsD0
-aegr1elcclM5wi8EoDat6mwLlUkT3atl5TuqiNejn1aykeN/ayNKXoLShcTe1Y8=
-=uJ5K
+iQEcBAEBCAAGBQJSQ0lSAAoJEO+t9ga+3I3aAkEIAKACADEF54LHaPv7sfk+78xv
+HGeQGC56V/xl6H2PoTEFJmHliQnUHvKLjY+e0AC+Xk4/wB2NGbqEl+LwqnvJMMyF
+TKlDkC+4/82BM4Q/E42cwOisFhuVukAgIlIg9hvaRsIcgP7KtxXO+NzEz9fa1mrx
+nnKGFnsefvhCGbIMqMEuJ5xMoJc2oLhjnd8QYhhCGSElW7I+eHU9jIuWHVA4hNsS
+Joc9J6KlHmwnAn9aK61vX5UwJR7PJfmQxUheK4ovU9arF+NhQT3YCsTuWPGuCbE4
+7i2LpHn6Xdxt10DcFWjRFt6NOJuJQDJ6T2ufsSW3qHlnSXvNOqiwnUeM6ZcAu/A=
+=x0DP
 -----END PGP SIGNATURE-----
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; }
+