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

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

[Michael Palimaka]

commit:     4b5177e5aed652c708c074cf08c002ce27862474
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 20:45:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 20:45:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5177e5

sci-visualization/kst: add patch to fix build failure with USE="qt5"

Gentoo-bug: 587948

Package-Manager: portage-2.3.0

 .../kst/files/kst-2.0.8-includes.patch             | 25 ++++++++++++++++++++++
 sci-visualization/kst/kst-2.0.8.ebuild             |  1 +
 2 files changed, 26 insertions(+)

diff --git a/sci-visualization/kst/files/kst-2.0.8-includes.patch b/sci-visualization/kst/files/kst-2.0.8-includes.patch
new file mode 100644
index 00000000..113d9dc
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-includes.patch
@@ -0,0 +1,25 @@
+Add missing includes required for Qt 5 build to succeed.
+
+Author: David Carne <davidcarne@gmail.com>
+Gentoo-bug: 587948
+
+--- a/src/libkst/editablematrix.cpp
++++ b/src/libkst/editablematrix.cpp
+@@ -19,6 +19,7 @@
+ #include "debug.h"
+ #include <qbytearray.h>
+ #include <QXmlStreamWriter>
++#include <QDataStream>
+ 
+ namespace Kst {
+ 
+--- a/src/libkst/editablevector.cpp
++++ b/src/libkst/editablevector.cpp
+@@ -18,6 +18,7 @@
+ // Create QDataStream into a QByteArray
+ // qCompress the bytearray
+ #include <QXmlStreamWriter>
++#include <QDataStream>
+ 
+ #include "debug.h"
+ namespace Kst {

diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild
index 5d2eafa..2d368b8 100644
--- a/sci-visualization/kst/kst-2.0.8.ebuild
+++ b/sci-visualization/kst/kst-2.0.8.ebuild
@@ -53,6 +53,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS README.kstScript )
+PATCHES=( "${FILESDIR}/${P}-includes.patch" )
 
 src_configure() {
 	local mycmakeargs=(

[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@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 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=(

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

[Andreas Sturmlechner]

commit:     c3876a84c08510d2351ee41d189e58f2592b8c77
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 11:44:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 12:52:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3876a84

sci-visualization/kst: Fix build w/ >=dev-util/cmake-3.20

Closes: https://bugs.gentoo.org/778560
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kst/files/kst-2.0.8-cmake-3.20.patch           | 32 ++++++++++++++++++++++
 sci-visualization/kst/kst-2.0.8-r1.ebuild          |  1 +
 2 files changed, 33 insertions(+)

diff --git a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
new file mode 100644
index 00000000000..39e2df7d0a6
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
@@ -0,0 +1,32 @@
+From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001
+From: Adriaan de Groot <groot@kde.org>
+Date: Sat, 3 Apr 2021 00:47:52 +0200
+Subject: [PATCH] Fix CMake-time with CMake 3.20
+
+Having multiple else-blocks for a single if() is now a syntax
+error; they need to be elseif() with only a single
+optional else() at the end.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 593dcb11..f965bd64 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,10 +116,10 @@ elseif(kst_3rdparty_download)
+         elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
+             set(ver 4.7)
+             set(md5 de6e8dbab1bb17eee6057941fddc93e3)
+-        else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
++        elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
+             set(ver 4.6)
+             set(md5 70d8670af9c21eb8fb466654c95d8e4d)
+-        else(GCC_VERSION VERSION_GREATER 4.4)
++        elseif(GCC_VERSION VERSION_GREATER 4.4)
+             set(ver 4.4)
+             set(md5 999248fb40a44543af4dd4cd1be0ceeb)
+         else()
+-- 
+GitLab
+

diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild
index e7319cac830..dea0db42382 100644
--- a/sci-visualization/kst/kst-2.0.8-r1.ebuild
+++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-includes.patch"
 	"${FILESDIR}/${P}-qt-5.11.patch"
 	"${FILESDIR}/${P}-gsl-2.0.patch"
+	"${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560
 )
 
 src_configure() {