media-video/kmplayer: Fix build with Qt 5.11_beta3
authorAndreas Sturmlechner <asturm@gentoo.org>
Tue, 17 Apr 2018 10:10:44 +0000 (12:10 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Tue, 17 Apr 2018 12:02:23 +0000 (14:02 +0200)
Package-Manager: Portage-2.3.29, Repoman-2.3.9

media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch [new file with mode: 0644]
media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild

diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
new file mode 100644 (file)
index 0000000..8c91fa6
--- /dev/null
@@ -0,0 +1,29 @@
+From 66b262c344deb6ac4924966a584e8aeb3d899180 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 12:07:04 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f675d9a..57af1ed 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml
+ 
+ add_executable(kphononplayer ${kphononplayer_SRCS})
+ 
+-qt5_use_modules(kphononplayer Core DBus Widgets X11Extras)
+-
+-target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES})
++target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}
++    Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras
++)
+ 
+ install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-- 
+2.17.0
+
index 3c55fbb6562420bf18303bbb19abfa56317ceb78..bb6d4b92d3e46ffa1a669e12360675b2a2430a21 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,6 +61,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-cmake.patch
        "${FILESDIR}"/${P}-desktop.patch
        "${FILESDIR}"/${P}-qt-5.9.patch
+       "${FILESDIR}"/${P}-qt-5.11b3.patch
 )
 
 src_prepare() {