diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-21 10:53:41 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-21 10:54:29 +0200 |
| commit | 47d05368ae4b256e97cc0fd155004c07f05e3b27 (patch) | |
| tree | 410d5d6c7ea5cf44d0415540f16849b1f4766a0c | |
| parent | sys-fs/aufs4: Version Bump (diff) | |
| download | gentoo-47d05368ae4b256e97cc0fd155004c07f05e3b27.tar.gz gentoo-47d05368ae4b256e97cc0fd155004c07f05e3b27.tar.bz2 gentoo-47d05368ae4b256e97cc0fd155004c07f05e3b27.zip | |
media-video/kmplayer: Fix build with Qt-5.9, bug #634942
Package-Manager: Portage-2.3.12, Repoman-2.3.3
| -rw-r--r-- | media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch | 42 | ||||
| -rw-r--r-- | media-video/kmplayer/kmplayer-0.12.0b.ebuild | 7 |
2 files changed, 46 insertions, 3 deletions
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch new file mode 100644 index 000000000000..80f3bee6ee88 --- /dev/null +++ b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch @@ -0,0 +1,42 @@ +From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer <wbauer@tmo.at> +Date: Wed, 11 Oct 2017 22:16:02 +0200 +Subject: Fix build with Qt 5.9 + +Summary: +moc 5.9 errors out when building: +Error: Plugin Metadata file "" could not be opened: file to open is a directory + +Same issue and fix as https://phabricator.kde.org/D5392 for khtml. + +CCBUG: 377490 + +Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions. + +Reviewers: vriezen, pino + +Reviewed By: pino + +Subscribers: pino + +Differential Revision: https://phabricator.kde.org/D5985 +--- + src/kmplayer_part.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h +index f90f85d..0fddbaa 100644 +--- a/src/kmplayer_part.h ++++ b/src/kmplayer_part.h +@@ -36,7 +36,7 @@ namespace KMPlayer { + + class KMPlayerFactory : public KPluginFactory { + Q_OBJECT +- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") ++ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") + Q_INTERFACES(KPluginFactory) + public: + KMPlayerFactory(); +-- +cgit v0.11.2 + diff --git a/media-video/kmplayer/kmplayer-0.12.0b.ebuild b/media-video/kmplayer/kmplayer-0.12.0b.ebuild index dff58d1dbfff..91517704d76a 100644 --- a/media-video/kmplayer/kmplayer-0.12.0b.ebuild +++ b/media-video/kmplayer/kmplayer-0.12.0b.ebuild @@ -3,7 +3,6 @@ EAPI=6 -EGIT_BRANCH="0.12" KDE_HANDBOOK="true" inherit kde5 @@ -55,13 +54,15 @@ RDEPEND="${CDEPEND} !media-video/kmplayer:4 " +PATCHES=( "${FILESDIR}/${P}-qt-5.9.patch" ) + src_prepare() { + kde5_src_prepare + if use npp; then sed -i src/kmplayer_part.desktop \ -e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die fi - - kde5_src_prepare } src_configure() { |