summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-17 12:10:44 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-17 14:02:23 +0200
commit03964a3d059896a735c44e5636a37958165ce4ff (patch)
tree418cac017324e3caee2b0d997a3aa557942da4b3
parentsci-chemistry/avogadro2: Fix build with Qt 5.11_beta3 (diff)
downloadgentoo-03964a3d059896a735c44e5636a37958165ce4ff.tar.gz
gentoo-03964a3d059896a735c44e5636a37958165ce4ff.tar.bz2
gentoo-03964a3d059896a735c44e5636a37958165ce4ff.zip
media-video/kmplayer: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.29, Repoman-2.3.9
-rw-r--r--media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch29
-rw-r--r--media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild3
2 files changed, 31 insertions, 1 deletions
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
index 00000000000..8c91fa6c2ff
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
@@ -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
+
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
index 3c55fbb6562..bb6d4b92d3e 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
@@ -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() {