summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-02-18 10:41:47 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-02-18 10:41:47 +0000
commiteb46272aa1a013bb9dc54729478cd60591b312ca (patch)
treef7148b8f8d24e2c6be5b6069a908df782979c0a3 /media-video/kmplayer
parentVersion bump (diff)
downloadgentoo-2-eb46272aa1a013bb9dc54729478cd60591b312ca.tar.gz
gentoo-2-eb46272aa1a013bb9dc54729478cd60591b312ca.tar.bz2
gentoo-2-eb46272aa1a013bb9dc54729478cd60591b312ca.zip
Fix linking issue. Per bug #258995. Thanks to Rick Harris for the patch.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'media-video/kmplayer')
-rw-r--r--media-video/kmplayer/ChangeLog6
-rw-r--r--media-video/kmplayer/files/0.11.0a-fix_linking.patch25
-rw-r--r--media-video/kmplayer/kmplayer-0.11.0a.ebuild4
3 files changed, 33 insertions, 2 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/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 \