Fix linking issue. Per bug #258995. Thanks to Rick Harris for the patch.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 36 insertions, 5 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index c635223d671a..879e8ef937b1 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.120 2009/02/15 17:21:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.121 2009/02/18 10:41:47 scarabeus Exp $
+
+  18 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/0.11.0a-fix_linking.patch, kmplayer-0.11.0a.ebuild:
+  Fix linking issue. Per bug #258995. Thanks to Rick Harris for the patch.
 
 *kmplayer-0.10.0c-r1 (15 Feb 2009)
 
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 1786dcd2b7e2..55ead0fc87f1 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,3 +1,4 @@
+AUX 0.11.0a-fix_linking.patch 908 RMD160 3c5aa17ddc2da9b1fac682595b6aa9078c0c836a SHA1 4408d9096c49bad541e03ee7cb1850c17517cc0d SHA256 9b0a0bcc18cfdba5fc7ad72ecb7da0b2ca3c5f5296602469ebf1493b5438f0e8
 AUX kmplayer-0.10.0-prtypes.patch 843 RMD160 3da261a5e254beaf20c340e06952d8065d20bf28 SHA1 4fbb734b2f0490b9adebd9a4e2553c0be9512230 SHA256 a192d8569abae303feb9c47842fde4bb2dd95cf535d318820c3017e538239c43
 AUX kmplayer-0.10.0c-desktop-file.diff 497 RMD160 0d39570e70eb506587c6d7893a4815cade8cc7a5 SHA1 56b969a538b5ae470b80955658c0c5878be9280b SHA256 24ecdeef6a5fb3df8a481b7e108be7573947f37cd57a822ddd520881c7d1fe59
 AUX kmplayer-0.9.4a-vop2vf.patch 3636 RMD160 9f435e2003ad0bc855a698964814fa90bb7ca88c SHA1 017911852e58dcd50772ae9cc8ebc45c84eeee4a SHA256 71b74ae6812912ab8f4c825cd0407236b5fc76c520974eb8677a1a2ebd258af3
@@ -10,8 +11,7 @@ EBUILD kmplayer-0.10.0.ebuild 2940 RMD160 b95bd3f466e4402c7cf87cec77c811f6ad4c8b
 EBUILD kmplayer-0.10.0a.ebuild 3077 RMD160 d20249da66d5fb75ea69a1405b76798673e973d9 SHA1 14da885585a3a266e379bc5d41c653719c19cb9c SHA256 64850212de79473a922954ab72db4beb67a298dff8c7a01f530fe3dad1b845dc
 EBUILD kmplayer-0.10.0c-r1.ebuild 2826 RMD160 673181de9067f58f4a416c297b1d7bd6a16dc7f7 SHA1 74968236348cc60fa0e2a76bc8562e255eb46f1c SHA256 4bdff35e3b1732a86c61351623d5c24162bda3f977320eca25062b0f9ce2f14c
 EBUILD kmplayer-0.10.0c.ebuild 3001 RMD160 da889ddae77310d28e9d3efe495d9c7935dedbaa SHA1 93e8f44c741921a12cc432080d18da876a76404f SHA256 5f47dc7814bdd73a482197edeb3caf1746ac1ffe6d44f52f5b1ecf94ac4ef0f0
-EBUILD kmplayer-0.11.0a.ebuild 1518 RMD160 04117768af9360b420e3aee5ebf2295e44dcf674 SHA1 5231e498ee5a9b1c3a925c9d2f0c3801ed946683 SHA256 187ac654c33bd5b47d163a5f30d11199a684e18e21ef33f46de6d36e0480e714
+EBUILD kmplayer-0.11.0a.ebuild 1567 RMD160 9909bdb015294e8bec1bdc4175ddecd2eee1a32f SHA1 8dc7594e416b8fe6d5af751e76ceec6e937e5ffb SHA256 1c0a6cf110763ce21bf11378a511e9fb4615dc8fe30f3126335284f7b52233b7
 EBUILD kmplayer-0.9.4a-r1.ebuild 2365 RMD160 eaba9fe9e98f01d7a98f71f99451e961d12d430d SHA1 af3b7109ead14f3926ba45c5f989fcf1e10c4e3c SHA256 586346e2cd2cbc82007853e538c4d689551970efa0fa6814b6d4212cc04781e9
-MISC ChangeLog 17021 RMD160 ed083ff489321e2eae5d8a958ffc128e59cdb2b6 SHA1 73ee731fa7c3b2ac3b4723b05eda0039f813850f SHA256 fe88205e23a511226e23fd335b964d635da5c5405cbcfb187c3d788d1c2442ca
+MISC ChangeLog 17214 RMD160 4cc3d19c6495fd73e00b67d57c7841922a53aac9 SHA1 18392278eac5dd5bd3cfe52999ff2a74b47b3a7b SHA256 9f6d419e00c03f8949f95cbe8098550853b9766b74e03acdf15f8deb919c7bb7
 MISC metadata.xml 427 RMD160 c44a276c2bec1408fb537a0db3422de2958c23ba SHA1 dd328c866c4cd6837cd40a5ddc8a4470ea02bd2f SHA256 debd27d9d06ca1dd09cb347e5f43a83f3bdbf1bce66564c6a247d18928f24b06
-MISC tags 146 RMD160 484973d725a6df2642d26557fc79e021e9629456 SHA1 9d75468ff68aac7596d0c2954e8bd4632be9a404 SHA256 26d2e69111d26903e1104bbe1bbe53c54a6195e286cf8634f4455897b00d9ea6
diff --git a/media-video/kmplayer/files/0.11.0a-fix_linking.patch b/media-video/kmplayer/files/0.11.0a-fix_linking.patch
new file mode 100644
index 000000000000..2aa51ad2046b
--- /dev/null
+++ b/media-video/kmplayer/files/0.11.0a-fix_linking.patch
@@ -0,0 +1,25 @@
+diff -urN kmplayer-0.11.0a/src/kmplayer_part.cpp kmplayer-0.11.0a-patched/src/kmplayer_part.cpp
+--- kmplayer-0.11.0a/src/kmplayer_part.cpp	2009-01-26 06:27:46.000000000 +1030
++++ kmplayer-0.11.0a-patched/src/kmplayer_part.cpp	2009-02-18 11:19:12.000000000 +1030
+@@ -125,6 +125,21 @@
+       return new KMPlayerPart (wparent, parent, args);
+ }
+ 
++KDE_NO_EXPORT QString PartBase::getStatus () {
++    QString rval = "Waiting";
++    if (source() && source()->document()) {
++        if (source()->document()->unfinished ())
++            rval = "Playable";
++        else if (source()->document()->state >= Node::state_deactivated)
++            rval = "Complete";
++    }
++    return rval;
++}
++
++KDE_NO_EXPORT QString PartBase::doEvaluate (const QString &) {
++    return "undefined";
++}
++
+ const KComponentData &KMPlayerFactory::componentData () {
+     kDebug () << "KMPlayerFactory::instance";
+     if (!s_instance)
diff --git a/media-video/kmplayer/kmplayer-0.11.0a.ebuild b/media-video/kmplayer/kmplayer-0.11.0a.ebuild
index 2a4a2ae1a280..5c6536292a50 100644
--- a/media-video/kmplayer/kmplayer-0.11.0a.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.0a.ebuild,v 1.2 2009/02/13 12:01:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.0a.ebuild,v 1.3 2009/02/18 10:41:47 scarabeus Exp $
 
 EAPI="2"
 
@@ -30,6 +30,8 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "$FILESDIR/${PV}-fix_linking.patch" )
+
 src_prepare() {
 	# fixup icon install
 	sed -i \