gentoo resync : 26.11.2017

7 files changed, 335 insertions, 6 deletions

diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index dfa7e43097ae..2b22bf43aff3 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,6 +1,10 @@
-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 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
+AUX kmplayer-0.12.0b-cmake.patch 1494 BLAKE2B 51ce1dd8118e36f864588a02107868493cefab78e0a1cb17751eb6bc5bd4d9b04795c849973be465429b6574050d94facad3aa569bae2b4ddc731a51718931ef SHA512 ea899817fc49fea549b4b2e2a180d2db2cb3310d88d9ff5464dbe19334428fb2afbec0228ccaf320229f8102f66f29dd64533f529021bba4a93933bc1f6e09d4
+AUX kmplayer-0.12.0b-desktop.patch 1629 BLAKE2B 09640d28334f91753a01b9f799ad3929f578f0127cf2012b0fea96f342d389661ac06719ef78d8ca12386658e051433ba6a8a1b0b2ea20c82901e454cb240a6d SHA512 bf85ab238afae771ba99299d719bf398444efacdf3092ff93c0472b831a4996b11762573d9cd9ecba88e882cb7bb801780afe87652a1657afe7903d639d1678e
+AUX kmplayer-0.12.0b-devpixelratio.patch 1290 BLAKE2B 1b076e616f6a8bc645b4505101f95b0c30422f83ffd01c01277196eef9f69f2be5f73880dddf55700f3b94aec7fadc45582b42b93dd68b419c883274980a3220 SHA512 4090efd279df4f106e197886eaacce73a24b60edf6eebdd1811f84ff3eb4798505278d397327b1b07c3423774a45fe6de02455a8f0ba20548c074840c89ac0fa
+AUX kmplayer-0.12.0b-qfile.patch 1387 BLAKE2B 6c04f0dc3eeed0635397a22fe5dc5b6fe5215c16a03f6c1f05a77353daac5c6b1f77d277e746b5283feaf5ba50eab68947c16cee9b6ac6f0642ba3051323c85f SHA512 3cee584d1560e4b9cf7ba621c907e3e521f0e778f728728f476cee98babb49122428605468d65d366fd382ee79746dffb5002cd6a9205f1eff3c827b77152753
+AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
+AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
+DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
+EBUILD kmplayer-0.12.0b-r1.ebuild 2413 BLAKE2B 2011067c8da295e95e02cfc1f2f1a3725fee22c9f42637c0d875f563b640630a53efd9fe6c4a889ed9484376c1188557ad3c1523afffc4c74a5a82652b97b6fb SHA512 16624eab505efc23feae705f739d3441d0355b17b7a3e42ff77fcd23a5c0b9ec5cfba3574fea1f0a29ffff38683ba8ff529fdb560c988af43685cb9f760fb9df
+EBUILD kmplayer-0.12.0b.ebuild 2103 BLAKE2B a60e24e72562d7cc85741bfd6c384bb626790714221ee0f670e3221a80923c87bbbedbabd0622cefbfc657c5be3b3fc4e6e03f5cef03cdf926f1287109ecfb34 SHA512 3e64bf1ecca26da93c2e6417a811a9610d7cd5ba4b5216bb53891bc47b4215dbe845bb0d68ea9532f0ac12e9f398f17727382468e6b4e67e05e7afe7cb80933f
+MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
new file mode 100644
index 000000000000..a99b1149f8c3
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
@@ -0,0 +1,50 @@
+From 2a5df7b875a8c5acb99be05baf84e5c9800d52a3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 13 May 2017 18:57:15 +0200
+Subject: cmake: fix endif syntax
+
+it does not match the if condition, so just remove it (also to ease
+reading it)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 057fcc4..14a55d2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,7 +81,7 @@ add_subdirectory(src)
+ add_subdirectory(icons)
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION)
+   add_subdirectory(doc)
+-endif(KF5DocTools_VERSION)
++endif()
+ add_subdirectory(data)
+ 
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+
+From 41a284a0f5f728556280b9f942961631566ad7ff Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 13 May 2017 19:04:47 +0200
+Subject: cmake: use NO_POLICY_SCOPE for KDECompilerSettings
+
+just like done for all the other projects
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14a55d2..5a58a35 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D
+ 
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+-include(KDECompilerSettings)
++include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMInstallIcons)
+ #include(ECMSetupVersion)
+ include(FeatureSummary)
+-- 
+cgit v0.11.2
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
new file mode 100644
index 000000000000..c84944effc29
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
@@ -0,0 +1,47 @@
+From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Sat, 13 May 2017 21:13:43 +0200
+Subject: Fix .desktop: Qt5 apps accept qwindowtitle, not caption
+
+---
+ src/org.kde.kmplayer.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org.kde.kmplayer.desktop b/src/org.kde.kmplayer.desktop
+index fcc5255..2b5435c 100644
+--- a/src/org.kde.kmplayer.desktop
++++ b/src/org.kde.kmplayer.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=Application
+-Exec=kmplayer -caption %c %i %U
++Exec=kmplayer -qwindowtitle %c %i %U
+ Icon=kmplayer
+ X-DocPath=kmplayer/index.html
+ Comment=KDE interface for MPlayer
+
+From 6b7757397c6181664d58d0a9e09cc329f279cc72 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Sat, 13 May 2017 21:13:36 +0200
+Subject: Add org namespace to the desktop file
+
+Required by the Desktop Entry Specification for desktop file
+with Type=Application.
+---
+ src/CMakeLists.txt           |   2 +-
+ src/kmplayer_part.desktop    |   2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7a05382..f675d9a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -122,7 +122,7 @@ install(TARGETS kdeinit_kmplayer  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ 
+ install(TARGETS kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-install(FILES kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
++install(FILES org.kde.kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ 
+ #qt5_add_dbus_interface(kmplayer_SRCS org.kde.Konqueror.Main.xml kmplayer_interface)
+ 
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
new file mode 100644
index 000000000000..0dea98084e3e
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
@@ -0,0 +1,36 @@
+From 93fa2c2587fa8b2f1b0da4ab7f7f2978f105fac2 Mon Sep 17 00:00:00 2001
+From: Koos Vriezen <koos.vriezen@gmail.com>
+Date: Sun, 30 Oct 2016 12:58:05 +0100
+Subject: Update pixel_device_ratio before painting instead on app startup
+
+Only used for adding a few pixels to text bounds. So if dragging the app
+from a low res to a hires display, that could cause text being tuncated.
+---
+ src/viewarea.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/viewarea.cpp b/src/viewarea.cpp
+index e407c95..77a260f 100644
+--- a/src/viewarea.cpp
++++ b/src/viewarea.cpp
+@@ -1892,9 +1892,6 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (QWidget *, View * view, bool paint_bg)
+    m_minimal (false),
+    m_updaters_enabled (true),
+    m_paint_background (paint_bg) {
+-#if QT_VERSION >= 0x050600
+-    pixel_device_ratio = devicePixelRatioF();
+-#endif
+     if (!paint_bg)
+         setAttribute (Qt::WA_NoSystemBackground, true);
+     QPalette palette;
+@@ -2030,6 +2027,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoveEvent (QMouseEvent * e) {
+ 
+ KDE_NO_EXPORT void ViewArea::syncVisual () {
+ #if QT_VERSION >= 0x050600
++    pixel_device_ratio = devicePixelRatioF();
+     int w = (int)(width() * devicePixelRatioF());
+     int h = (int)(height() * devicePixelRatioF());
+ #else
+-- 
+cgit v0.11.2
+
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
new file mode 100644
index 000000000000..32b645cd0a00
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
@@ -0,0 +1,33 @@
+From 7dce8e00c8e48cc08d3cc39909681643aa36ed62 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Mon, 8 May 2017 18:07:40 +0200
+Subject: Use QFile to copy a file instead of /bin/cp
+
+The code has been there probably way before QFile gained the copy
+functionality.
+---
+ src/kmplayerpartbase.cpp | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
+index fd7b363..f718496 100644
+--- a/src/kmplayerpartbase.cpp
++++ b/src/kmplayerpartbase.cpp
+@@ -124,12 +124,8 @@ PartBase::PartBase (QWidget * wparent, QObject * parent, KSharedConfigPtr config
+     QString bmfile = KStandardDirs::locate ("data", "kmplayer/bookmarks.xml");
+     QString localbmfile = KStandardDirs::locateLocal ("data", "kmplayer/bookmarks.xml");
+     if (localbmfile != bmfile) {
+-        QProcess p;
+-        QStringList args;
+-        args << QFile::encodeName (bmfile) << QFile::encodeName (localbmfile);
+-        p.start ("/bin/cp", args);
+-        kDebug () << "cp " << args.join (" ");
+-        p.waitForFinished ();
++        bool bmfileCopied = QFile(bmfile).copy(localbmfile);
++        kDebug() << "bookmarks.xml copied successfully?" << bmfileCopied;
+     }
+     m_bookmark_manager = KBookmarkManager::managerForFile (localbmfile, "kmplayer");
+     m_bookmark_owner = new BookmarkOwner (this);
+-- 
+cgit v0.11.2
+
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
new file mode 100644
index 000000000000..02bf9f38b561
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
@@ -0,0 +1,61 @@
+From 5517262a2a328518dd42a8aa0e37a34152a06282 Mon Sep 17 00:00:00 2001
+From: Koos Vriezen <koos.vriezen@gmail.com>
+Date: Sun, 30 Oct 2016 12:50:03 +0100
+Subject: scheduleRepaint should be called with pixel coordinates
+
+---
+ src/viewarea.cpp | 31 ++++++++++++++++++++++++++-----
+ 1 file changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/src/viewarea.cpp b/src/viewarea.cpp
+index 24f68cf..e4df941 100644
+--- a/src/viewarea.cpp
++++ b/src/viewarea.cpp
+@@ -2117,9 +2117,20 @@ KDE_NO_EXPORT void ViewArea::syncVisual () {
+ 
+ KDE_NO_EXPORT void ViewArea::paintEvent (QPaintEvent * pe) {
+ #ifdef KMPLAYER_WITH_CAIRO
+-    if (surface->node)
+-        scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ()));
+-    else
++    if (surface->node) {
++#if QT_VERSION >= 0x050600
++        int x = (int)(pe->rect().x() * devicePixelRatioF());
++        int y = (int)(pe->rect().y() * devicePixelRatioF());
++        int w = (int)(pe->rect().width() * devicePixelRatioF());
++        int h = (int)(pe->rect().height() * devicePixelRatioF());
++#else
++        int x = pe->rect().x();
++        int y = pe->rect().y();
++        int w = pe->rect().width();
++        int h = pe->rect().height();
++#endif
++        scheduleRepaint(IRect(x, y, w, h));
++    } else
+ #endif
+         if (m_fullscreen || m_paint_background)
+     {
+@@ -2647,8 +2658,18 @@ void VideoOutput::setGeometry (const IRect &rect) {
+ void VideoOutput::setAspect (float a) {
+     m_aspect = a;
+     QRect r = geometry ();
+-    m_view->viewArea ()->scheduleRepaint (
+-            IRect (r.x (), r.y (), r.width (), r.height ()));
++#if QT_VERSION >= 0x050600
++    int x = (int)(r.x() * devicePixelRatioF());
++    int y = (int)(r.y() * devicePixelRatioF());
++    int w = (int)(r.width() * devicePixelRatioF());
++    int h = (int)(r.height() * devicePixelRatioF());
++#else
++    int x = r.x();
++    int y = r.y();
++    int w = r.width();
++    int h = r.height();
++#endif
++    m_view->viewArea()->scheduleRepaint(IRect(x, y, w, h));
+ }
+ 
+ KDE_NO_EXPORT void VideoOutput::map () {
+-- 
+cgit v0.11.2
+
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
new file mode 100644
index 000000000000..3935f773006c
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
+HOMEPAGE="https://kmplayer.kde.org"
+SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
+
+LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo npp"
+
+CDEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(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)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libxcb
+	cairo? ( x11-libs/cairo[xcb] )
+	npp? (
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		www-plugins/adobe-flash:*
+		>=x11-libs/gtk+-2.10.14:2
+	)
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${CDEPEND}
+	media-video/mplayer
+	!media-video/kmplayer:4
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-schedulerepaint.patch
+	"${FILESDIR}"/${P}-devpixelratio.patch
+	"${FILESDIR}"/${P}-qfile.patch
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-qt-5.9.patch
+)
+
+src_prepare() {
+	# Prerequisite for ${P}-desktop.patch:
+	mv src/kmplayer.desktop src/org.kde.kmplayer.desktop || die
+	kde5_src_prepare
+
+	if use npp; then
+		sed -i src/kmplayer_part.desktop \
+			-e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die
+	fi
+}
+
+src_configure() {
+	# 0.12: expat build broken, check in later releases
+	local mycmakeargs=(
+		-DKMPLAYER_BUILT_WITH_EXPAT=OFF
+		-DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
+		-DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	if use npp; then
+		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" \
+			--group "application/x-shockwave-flash" --key player npp
+		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" \
+			--group "application/x-shockwave-flash" \
+			--key plugin /usr/$(get_libdir)/nsbrowser/plugins/libflashplayer.so
+	fi
+}