commit: e80bc265e3b70bbb051428c8c4746d250ebe796e Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat Aug 27 15:50:45 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Aug 31 14:41:09 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e80bc265
media-video/kmplayer: Sync with tree (DEPENDs, USE=npp fix) Drop obsolete/broken patch. Package-Manager: portage-2.2.28 media-video/kmplayer/files/kmplayer-flash.patch | 12 ------------ media-video/kmplayer/kmplayer-9999.ebuild | 12 +++++++----- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/media-video/kmplayer/files/kmplayer-flash.patch b/media-video/kmplayer/files/kmplayer-flash.patch deleted file mode 100644 index 0a6a72b..0000000 --- a/media-video/kmplayer/files/kmplayer-flash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN kmplayer-0.11.3d.old/src/kmplayer_part.desktop kmplayer-0.11.3d/src/kmplayer_part.desktop ---- kmplayer-0.11.3d.old/src/kmplayer_part.desktop 2012-06-10 14:35:46.000000000 +0200 -+++ kmplayer-0.11.3d/src/kmplayer_part.desktop 2012-09-11 14:42:04.160426844 +0200 -@@ -93,7 +93,7 @@ - Comment[zh_TW]=影像播放器外掛程式（與 QuickTime，XMovie，Windows Media 與 RealPlayer 相容） - X-KDE-Library=libkmplayerpart - # Keep in sync with the audio types in kmplayer.desktop --MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu; -+MimeType=application/x-shockwave-flash;application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu; - Type=Service - Icon=kmplayer - X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player diff --git a/media-video/kmplayer/kmplayer-9999.ebuild b/media-video/kmplayer/kmplayer-9999.ebuild index 120644a..8021739 100644 --- a/media-video/kmplayer/kmplayer-9999.ebuild +++ b/media-video/kmplayer/kmplayer-9999.ebuild @@ -9,6 +9,8 @@ inherit kde5 DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend" HOMEPAGE="https://kmplayer.kde.org"; +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2" + LICENSE="GPL-2 FDL-1.2 LGPL-2.1" KEYWORDS="" IUSE="cairo npp" @@ -25,6 +27,7 @@ CDEPEND=" $(add_frameworks_dep kio) $(add_frameworks_dep kmediaplayer) $(add_frameworks_dep kparts) + $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_qt_dep qtdbus) @@ -52,12 +55,11 @@ RDEPEND="${CDEPEND} !media-video/kmplayer:4 " -if [[ ${KDE_BUILD_TYPE} != live ]] ; then - S="${WORKDIR}/${PN}" -fi - src_prepare() { - use npp && epatch "${FILESDIR}/${PN}-flash.patch" + if use npp; then + sed -i src/kmplayer_part.desktop \ + -e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die + fi kde5_src_prepare }
