diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-16 05:02:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-16 05:02:38 +0100 |
| commit | f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch) | |
| tree | c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /sci-visualization/kst | |
| parent | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff) | |
gentoo resync : 16.06.2018
Diffstat (limited to 'sci-visualization/kst')
| -rw-r--r-- | sci-visualization/kst/Manifest | 3 | ||||
| -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 | 14 |
3 files changed, 36 insertions, 6 deletions
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest index 212f4bff2f04..c599a2fd3803 100644 --- a/sci-visualization/kst/Manifest +++ b/sci-visualization/kst/Manifest @@ -1,4 +1,5 @@ AUX kst-2.0.8-includes.patch 581 BLAKE2B f0c631be82fbad4a816938311accdfe8474e0b80241af677a26d46d3f7d0d15130c1d18c0a6aeb7443d4bd2f368a8cfe4634efb6b4ac7b6198f32b4b005c869c SHA512 d4b0f764beff6c8f9e8d64a5152153d1d9ddc72da029f5e10b83865e2f9aa94ae59eb1678b33f653ac06b38086b5bb03aa172c79cedbe562c0f1b9c872e124a4 +AUX kst-2.0.8-qt-5.11b3.patch 934 BLAKE2B 769c2ce96b334605b5452ff3f29696a7bad8ad47d46ac8d1107d4d262c3ad025a075636ba4029d9e1dcfb8dc6e356d8f23d32ac90c9402fac59e1dbfd5a04449 SHA512 4d2777210cf08bd0fbc8e533c1e890b42570e65b1cb10aaaeafb70ba5ed931086740f1b4d35af0950c10db249a6df1b4d2c6fa8348d7020bd51053bf4608f048 DIST Kst-2.0.8.tar.gz 14527129 BLAKE2B 5330dc97bc56bf8c6120a461e078ed1bdf87c4ec41b6f6ddc13d7500fde0d1b973b42da8f38c738d133559696d89ad579c288206c7ba07bbfd22dbc2bf6f2064 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb -EBUILD kst-2.0.8.ebuild 1082 BLAKE2B 3bf8474143503db4faa0a664514addde9864d0e2a41702e8eec96421e63348c4af1553ff13779b3eede3301e721d35fabd534fd350718b7a42d2ed8d94d01e16 SHA512 b696a26bccdab039f0d0845b5716048fccd2b9ddd50cd6c4208525182d2ea5c6a205e65e5db88afbe3c347e887b84d4576806e5708287eefee072250c4e8b2e3 +EBUILD kst-2.0.8.ebuild 1102 BLAKE2B 2fb39560721040993cc14f99d6ef8074c7e4844686798f75389826685e1d42b41b6855970b299e8f9294038fb9d30b30bec5471b9db2b7ae9e28a0c58415ee75 SHA512 28cd732e1f1a3b70a48ab0f5d3fe551972c28ff50ca5c54f658ea3de9da29123f47f8e45c75a64d84e5d31fb636254dc192af2b57d159a915544ec3c6d8116fe MISC metadata.xml 364 BLAKE2B 921c6ea44760ec3694ea9565aba0707f9b4d3e18cbd5fc9c523f1031e47dced5f96da57f1e24d68a0e5f3f7c4e1ea49a8c327c5a591928be77777a9248b8e3c1 SHA512 46ab4c2f002b9b516a49e8c678740344b3cdb79ce92ada0b22ee205fe17b54a804fcc520ae517bfc2f420870eaa28c40043007e54c4b55506e8edcdf7f958e66 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 000000000000..b211e1ed21ee --- /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@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 408da47f2984..1ea474c0cee9 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit cmake-utils multilib +inherit cmake-utils MY_P=Kst-${PV} @@ -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=( @@ -50,7 +54,7 @@ src_configure() { -Dkst_release=$(usex debug OFF ON) -Dkst_rpath=OFF -Dkst_svnversion=OFF - $(cmake-utils_use test kst_test) + -Dkst_test=$(usex test) ) cmake-utils_src_configure |