media-libs/phonon-vlc: Fix build with Qt 5.11_beta3

Package-Manager: Portage-2.3.28, Repoman-2.3.9

2 files changed, 34 insertions, 0 deletions

diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
new file mode 100644
index 000000000000..b87a1e175777
--- /dev/null
+++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
@@ -0,0 +1,32 @@
+From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 13 Apr 2018 23:16:52 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+Also replace automoc4_add_library with add_library.
+---
+ src/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 47427b2..f91975e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -80,8 +80,12 @@ if(APPLE)
+         video/mac/vlcmacwidget.mm)
+ endif(APPLE)
+ 
+-automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
+-qt5_use_modules(phonon_vlc Core Widgets)
++add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
++if(PHONON_BUILD_PHONON4QT5)
++    target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets)
++else()
++    target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++endif()
+ 
+ set_target_properties(phonon_vlc PROPERTIES
+     PREFIX ""
+-- 
+2.17.0
+
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
index 18a2f10173c6..9506df8aba4d 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_configure() {
 	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
 	cmake-utils_src_configure