Added upstream patch to fix the plugin detection at startup.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 34 insertions, 25 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index a851561602b2..365314c14e10 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.401 2011/04/20 05:05:10 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.402 2011/04/20 11:48:44 jmbsvicetto Exp $
+
+  20 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.0.90.ebuild, +files/amarok-2.4.0.90-fix-plugin-detection.patch:
+  Added upstream patch to fix the plugin detection at startup.
 
   20 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   files/amarok-2.4.0.90-fix-upnp-dep.patch:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index a6df578bb1ab..ef2f76b16b1d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,31 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf6945a19fe57472d2 SHA1 4f5c730f989c1f5aab57af72a9540223698bd7e1 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab
 AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1
+AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 RMD160 897a669e6a26e2559e713004849c19b7bd7f1033 SHA1 c6915369c3ecbceac7a8c5b8246f485fb760c2f4 SHA256 aae0ceca58b36ae714516fe46f1a4011836a3e3256a7efd106fdb8568e1fdbcf
 AUX amarok-2.4.0.90-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6
 DIST amarok-2.3.2.tar.bz2 13948250 RMD160 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 SHA1 594d6d3ad57832fb80ba4387459356132d37ace2 SHA256 842569da06b4ebfc334f3530a77f900ea30b3b8968698bda8082b4b991488237
 DIST amarok-2.4.0.90.tar.bz2 15190982 RMD160 9243c6d1be194829fa5ef21fa970457343ebf109 SHA1 c71d7fd28d42030ca887c7f24655ac4a47956c5a SHA256 4379d9f7b960ff2045f47c14b3866ca298e98c4bad82fe84fea08e52320ccb2a
 DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
 EBUILD amarok-2.3.2-r1.ebuild 4426 RMD160 7b32dc8c05f915c95471c1bb3a1eeaf86414c523 SHA1 7fbc321428906e9dc93d6219ae5e9111d7900d7b SHA256 823d1c580baba183401e486fa9fcfa163f3d656729861f56384285c1f36d0fbf
-EBUILD amarok-2.4.0.90.ebuild 4268 RMD160 5f5d1e33255c09307cbe2d6499a0f8f26895a1ef SHA1 db1679bb5962355c5e36179f4814957871b383b6 SHA256 188e935c569a47557e742a17a790e719967d38299abbf5f4746e691f44a880fa
+EBUILD amarok-2.4.0.90.ebuild 4498 RMD160 6b397d0332cce48f7cd272a1f4281012ff50d198 SHA1 bf7e3d65b22fc83c5a08fc91cce06bbeede93333 SHA256 19bfde0dce715b0eb2e83127f67372883cce05828a75a37a218a6192eb720307
 EBUILD amarok-2.4.0.ebuild 4080 RMD160 8e03436954bd32ad752b02419ae20663b1d6e763 SHA1 c26bae51a88de68ddea332e32d7feb255f377e02 SHA256 1a9b0dcb08e7aef17e0096e4e1eeb0d32432f760df50d8d85a1bdc92ef70a8bd
-MISC ChangeLog 68598 RMD160 56d8225a6fdea752378c0165cbd16dfe325c110b SHA1 bdc3de79445c64a4be094b43e28e589ab1d1016e SHA256 07096de429c90a26558773be5ec3ad701e47f9622eeb1a19ea3187fabd778673
+MISC ChangeLog 68806 RMD160 3306a28b53ad70a5bd71213cc1462ea88b98b932 SHA1 a53ab791b8f01caf0132afed74b42e742c8a8872 SHA256 852b45faa35459ed6d7c97269bf88c61c1a6bf58ec12bb1138d43370b6234c69
 MISC metadata.xml 1566 RMD160 1ba975766c2e4e1cb5b162bf97e534c78a638e6b SHA1 6e0705052a0f430b39e693a4a7d722299a4d46c7 SHA256 c034e203d562fb1ac92d0d48436f64d3a36d04a3dadd15c5f7eec73d9298bd71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNrmkGAAoJEC8ZTXQF1qEPvjcP+wQ+gvnDnzJd+Z4Ap8eWlx12
-I8qQdCW1/gcrBkBbtnSoEo6jtFyBY+NNGXs8dqvY9ms3SZl9ewTVekEp5A0No8hf
-vun4zQ2YK1iL9k67lk5sPbSGjOIMfGHYwrPJ6ofqHPBTLri4BTshi3rT8lEfjKV+
-Wy+SKOecGSS0vDroPoix6qWWEX3//5ahhA+H1ZWiNUu96+Tfqvn8rPioph3/mwFp
-zJ55pkchZ0McwY0iE9WK9zPjjNQZjifh731KQPQ22sM2b3SpWQEaupUxWBYSXo48
-tR2GEd05vGJMYeLz/srDTvkgXkJoCbDgWuxm1bqnUV1VR8Ex1K4/o8kDuPOEjyVv
-PqSCinOMw9amD4kdXl0n3V5p5/AkvJWFXK7HgKRKETwoLGYkC4/0htGjmCGXViTS
-BIR23/KLBS+V6tuMryhT/sQWay0WkBmdnCZP4luZUI/LnkTrhEc4VnyTmBLixu1j
-szhFhV4Pl4+ddIKl8dR1wcgfzHmVv6aCzghUbRtvrAKjvcrgRYGp6wTKG5Ksrkwi
-lDAMJYFbioRiM3Yfz6CZW/WUZJkNUrJkUqi1vXN68mHFLpZ3/hdbu8RYv3nEb1X5
-5OGODjdVotSsAK3coQ67GUe2YaW1BOgCPZscDT+XkC3haz4QwTrkUfYOIuBeFLTQ
-EVeyxhlaVMbWNCYa6KMR
-=mOtt
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.4.0.90.ebuild b/media-sound/amarok/amarok-2.4.0.90.ebuild
index 6440f8e61b7e..f1cd484a84fb 100644
--- a/media-sound/amarok/amarok-2.4.0.90.ebuild
+++ b/media-sound/amarok/amarok-2.4.0.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.90.ebuild,v 1.1 2011/04/19 02:40:12 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.90.ebuild,v 1.2 2011/04/20 11:48:44 jmbsvicetto Exp $
 
 EAPI="3"
 
@@ -82,7 +82,12 @@ RDEPEND="${COMMONDEPEND}
 	player? ( $(add_kdebase_dep phonon-kde) )
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-upnp-dep.patch" )
+# Upstream patch to fix the plugin detection on startup
+# https://projects.kde.org/projects/extragear/multimedia/amarok/repository/revisions/37eda947bd8181a73ad0fffc88e66c25ddd69f28
+PATCHES=(
+	"${FILESDIR}/${P}-fix-upnp-dep.patch"
+	"${FILESDIR}/${P}-fix-plugin-detection.patch"
+)
 
 src_prepare() {
 	if ! use player; then
diff --git a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch b/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
new file mode 100644
index 000000000000..d075ba048601
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
@@ -0,0 +1,19 @@
+commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28
+Author: Rick W. Chen <stuffcorpse@archlinux.us>
+Date:   Thu Mar 17 18:38:19 2011 +1300
+
+    Fix plugin loading and bump_plugin_version.rb script
+
+diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
+index ff52646..1e34510 100644
+--- a/src/PluginManager.cpp
++++ b/src/PluginManager.cpp
+@@ -32,7 +32,7 @@
+ #include <QFile>
+ #include <QMetaEnum>
+ 
+-const int Plugins::PluginManager::s_pluginFrameworkVersion = 60;
++const int Plugins::PluginManager::s_pluginFrameworkVersion = 61;
+ Plugins::PluginManager* Plugins::PluginManager::s_instance = 0;
+ 
+ Plugins::PluginManager*