diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-08-26 19:37:17 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-08-26 20:23:49 +0200 |
| commit | 901e0196c41d8c1b57e327370c6f9bbeba4d309f (patch) | |
| tree | 188f32b552189567798b4e3224a4dae56c4bfe67 /sci-visualization/kst | |
| parent | sci-libs/dcmtk: Put || die where || die belongs (diff) | |
| download | gentoo-901e0196c41d8c1b57e327370c6f9bbeba4d309f.tar.gz gentoo-901e0196c41d8c1b57e327370c6f9bbeba4d309f.tar.bz2 gentoo-901e0196c41d8c1b57e327370c6f9bbeba4d309f.zip | |
sci-visualization/kst: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/664532
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'sci-visualization/kst')
| -rw-r--r-- | sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch | 46 | ||||
| -rw-r--r-- | sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch | 25 | ||||
| -rw-r--r-- | sci-visualization/kst/kst-2.0.8.ebuild | 2 |
3 files changed, 47 insertions, 26 deletions
diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch new file mode 100644 index 000000000000..8409f6664d73 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch @@ -0,0 +1,46 @@ +From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux <christophe@krop.fr> +Date: Sun, 3 Jun 2018 19:43:34 +0200 +Subject: Fix build with Qt 5.11 + +Summary: +- qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead. +- Add a missing #include + +Subscribers: kde-edu + +Tags: #kde_edu + +Differential Revision: https://phabricator.kde.org/D13339 +--- + cmake/modules/KstMacros.cmake | 2 +- + src/libkstapp/view.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +index 4ff9c15..bc3d8a6 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}) +diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h +index 95c8c6a..2af5393 100644 +--- a/src/libkstapp/view.h ++++ b/src/libkstapp/view.h +@@ -14,6 +14,7 @@ + #define VIEW_H + + #include <QGraphicsView> ++#include <QMenu> + + #include "kst_export.h" + +-- +cgit v0.11.2 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 deleted file mode 100644 index b211e1ed21ee..000000000000 --- a/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 1ea474c0cee9..d8c58992ca3b 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -43,7 +43,7 @@ DOCS=( AUTHORS README.kstScript ) PATCHES=( "${FILESDIR}/${P}-includes.patch" - "${FILESDIR}/${P}-qt-5.11b3.patch" + "${FILESDIR}/${P}-qt-5.11.patch" ) src_configure() { |