[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/

[Andreas Sturmlechner]

commit:     10b8466f663b78d2dcbbe012310db237c2b8d7ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 07:04:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 07:16:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10b8466f

sci-visualization/kst: Fix build with Qt-5.11.0_beta3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../kst/files/kst-2.0.8-qt-5.11b3.patch            | 25 ++++++++++++++++++++++
 sci-visualization/kst/kst-2.0.8.ebuild             |  8 +++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch
new file mode 100644
index 00000000000..b211e1ed21e
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch
@@ -0,0 +1,25 @@
+From 91867d80df4fe8f26c9adbfe10c1c883ccb36697 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@g.o>
+Date: Tue, 12 Jun 2018 08:57:08 +0200
+Subject: [PATCH] Fix configure with Qt-5.11.0_beta3 (no more qt5_use_modules)
+
+---
+ cmake/modules/KstMacros.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake
+index 676d5731..95848f20 100644
+--- a/cmake/modules/KstMacros.cmake
++++ b/cmake/modules/KstMacros.cmake
+@@ -240,7 +240,7 @@ endmacro()
+ macro(kst_link)
+ 	target_link_libraries(${kst_name} ${ARGV})
+ 	if(kst_qt5)
+-		qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport)
++		target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
+ 	else()
+ 		target_link_libraries(${kst_name}
+ 		${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+-- 
+2.17.1
+

diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild
index 408da47f298..9d4e9bb326f 100644
--- a/sci-visualization/kst/kst-2.0.8.ebuild
+++ b/sci-visualization/kst/kst-2.0.8.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=5
@@ -40,7 +40,11 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS README.kstScript )
-PATCHES=( "${FILESDIR}/${P}-includes.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-includes.patch"
+	"${FILESDIR}/${P}-qt-5.11b3.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(