diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-21 21:00:58 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-21 21:00:58 +0100 |
| commit | 8b2628ad8526c806375e7b157889e4274b70248b (patch) | |
| tree | ccba8cd56af7e086131454d6062d5d31115791df /media-video | |
| parent | b620fb1b0929ff9657a2588aaa42b85e3021c102 (diff) | |
gentoo resync : 21.10.2017
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/kmplayer/Manifest | 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 |
3 files changed, 48 insertions, 4 deletions
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest index 717a2a548fb4..dfa7e43097ae 100644 --- a/media-video/kmplayer/Manifest +++ b/media-video/kmplayer/Manifest @@ -1,5 +1,6 @@ +AUX kmplayer-0.12.0b-qt-5.9.patch 1097 SHA256 de9450abf302d7e4ace23782986e9bec924a033775f77f7f38efd1e73208639b SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9 WHIRLPOOL bdfe853b1e5b5f35b06d4282e82af6ae9c5cd156e5949aad53f29ccfb9ec23d7c187470280ff7a83b6372b5b422a7c5ce7764f43159d24998b44bd03393ec8a8 DIST kmplayer-0.12.0b.tar.bz2 599496 SHA256 5e98cea9bd958860d90003d37037172a95ed8b699133e8f1e6033147aaefed73 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882 WHIRLPOOL 4ce75858bd6f385572f1c39e1aef47ad9526986b8c99de228d9e77168e804b2aeeca2933bb95c8be0f3a2200154473fd99a02af2d449a3861c845715f772570c -EBUILD kmplayer-0.12.0b.ebuild 2077 SHA256 c49eb87724e6a7d7e0cf4d5fe5da59622f53de75d6bad172da15647d63b55658 SHA512 15992dd9b6485df8ded3c2832d7171bb44ae8253ab2fc7b5bd499768c3c4194a74b9aab47fe6927e2d0b66a0ccf7db32f8a2e64cb05f575c070a92fdd0c41902 WHIRLPOOL c98aef27fefe1d14d569b07c2b7e775268ba3feed7bce39480c15a05231a156665b81b79227ec5ad2ad1798693e76d0beff38f810c709d12d0a2d04b1aa898e8 +EBUILD kmplayer-0.12.0b.ebuild 2103 SHA256 f7d9478cc3c4e983b760455687a83f36ceba6e40de5a74d4f5dde0da88e7eb7d SHA512 3e64bf1ecca26da93c2e6417a811a9610d7cd5ba4b5216bb53891bc47b4215dbe845bb0d68ea9532f0ac12e9f398f17727382468e6b4e67e05e7afe7cb80933f WHIRLPOOL 660e67bbfb4aa5b2060f588801f39320c04d16801b8cf8610bab88f412a9a7b95148a078a82f77de7efd98150ca5b752a9af56d9342ec477fd8150db1ccb530b MISC ChangeLog 5633 SHA256 15d410bd74fe1ef05557d48faac64ed49d381783bc53db4ff9c858616ea7a89e SHA512 5bd62143bfd2f04eb3db8125502ff2d0137a50d1d5e3e5a5fdc28556af894ee738f19209c6d4e7636b2f71a4d8e6812a65587ba448991cde0069af5b63c9cc54 WHIRLPOOL 039f38d9d89bbf83818bebb4e46b71d4c4566e7d017b6d5adeea57e1c3e1e7ac59f21b14340464d66e99ed173c8059d8456725b2714ce1c0debd8234bcb570cb MISC ChangeLog-2015 23920 SHA256 d16882d10c22fb9696c68b8e162fac2642aa7665f76373c11e4b2c4d6115c1d1 SHA512 09e481388be5ec4714798a16c905569cf1e5fcd14b7d27f9aef625dcc3ec10fe90eb49e04cb3d7d48ed4a2dc116325505b46e312efb444ea16c64cd326f910b0 WHIRLPOOL 652eeac8fe785f54c5fed1ea67afa684cde658c25e48eb49431cf90f023a4299b4d7395ecf0249016b4554fc3c95e42fcdb6f32f9b062cb9a169173b0db819cf MISC metadata.xml 475 SHA256 a1f733d5e733b1a3ffd4bc93667e65116737ce3efe1cd982b084d2897092aeac SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f WHIRLPOOL f1d2a0f4cfeb819bb0843fa1f3139402d8e6307b9897bb4765756864ca77c70b208e4ac3c2699066428f06ef8dcd669e9af697d6beb5ebf2551b70a7e0ac8c61 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() { |