mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-visualization/kst: Fix build with Qt-5.11.0_beta3
Package-Manager: Portage-2.3.40, Repoman-2.3.9
This commit is contained in:
25
sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch
Normal file
25
sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
From 91867d80df4fe8f26c9adbfe10c1c883ccb36697 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
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
|
||||
|
||||
@@ -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=(
|
||||
|
||||
Reference in New Issue
Block a user