* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
@ 2015-10-31 15:57 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2015-10-31 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 538037ef92741fc230242aa481cd198f737786da
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 15:56:17 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 15:57:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538037ef
sci-visualization/kst: remove old
Package-Manager: portage-2.2.20.1
sci-visualization/kst/Manifest | 1 -
.../kst/files/kst-2.0.7-cfitsio-includes.patch | 26 ---------
sci-visualization/kst/kst-2.0.7.ebuild | 65 ----------------------
3 files changed, 92 deletions(-)
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index ecba356..61fb665 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,2 +1 @@
-DIST Kst-2.0.7.tar.gz 11706657 SHA256 0ef0e1e85fa90472447eb53ee560970635532d2013d200d99ebdd105bd2eecee SHA512 d68968b9d161b74c42da87a3e5d9a2ade14e4c13e61526a0ef1e53538334b806d7f28ce3717e5a8ff85802b94aa2d7551422b873df5f180782994409ebc7ce17 WHIRLPOOL 654e054ceee5bb40de3a07d1a073c7192902616b018d355faa53770ed965eaf2dc83447f828af323401099a419ba2bfabfaacf77053e2ed4c79c123586683d3d
DIST Kst-2.0.8.tar.gz 14527129 SHA256 cefbfd3e3710771985e08f02a397ef8ab407168fa8415d2c3c5740c031af18c6 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb WHIRLPOOL d143cd2c88e7dcff1aeb53375272cf4b7a60f546a9c8dbd76bf8c9933575ab6fbb5f7e5f82f793dbde19d523af9314eeb8efecb8e82f30b3846ebf9d222d27d1
diff --git a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch b/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch
deleted file mode 100644
index 57238f8..0000000
--- a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/datasources/lfiio/lfiio.h b/src/datasources/lfiio/lfiio.h
-index bb6493c..8ed748c 100644
---- a/src/datasources/lfiio/lfiio.h
-+++ b/src/datasources/lfiio/lfiio.h
-@@ -18,7 +18,7 @@
-
- #include <datasource.h>
- #include <dataplugin.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
-
- class LFIIOSource : public Kst::DataSource {
- Q_OBJECT
-diff --git a/src/datasources/planckIDEF/planckIDEF.h b/src/datasources/planckIDEF/planckIDEF.h
-index 7fb226f..6e6d82f 100644
---- a/src/datasources/planckIDEF/planckIDEF.h
-+++ b/src/datasources/planckIDEF/planckIDEF.h
-@@ -16,7 +16,7 @@
-
- #include <datasource.h>
- #include <dataplugin.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
-
- typedef struct {
- QString file;
diff --git a/sci-visualization/kst/kst-2.0.7.ebuild b/sci-visualization/kst/kst-2.0.7.ebuild
deleted file mode 100644
index 8c1b5df..0000000
--- a/sci-visualization/kst/kst-2.0.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-CMAKE_USE_DIR=${S}/cmake
-MY_PN="Kst"
-inherit cmake-utils multilib
-
-DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4"
-HOMEPAGE="https://kst.kde.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +qt4 qt5 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RESTRICT="test"
-
-RDEPEND="
- qt4? (
- dev-qt/qtcore:4
- || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
- dev-qt/qtopengl:4
- dev-qt/qtsvg:4
- )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/designer:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sci-libs/cfitsio
- sci-libs/getdata
- sci-libs/gsl
- sci-libs/netcdf-cxx:3
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:4 )
-"
-
-DOCS=( AUTHORS ChangeLog )
-PATCHES=( "${FILESDIR}/${PN}-2.0.7-cfitsio-includes.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -Dkst_install_libdir=$(get_libdir)
- -Dkst_pch=OFF
- -Dkst_release=$(usex debug OFF ON)
- -Dkst_rpath=OFF
- -Dkst_svnversion=OFF
- $(cmake-utils_use test kst_test)
- $(cmake-utils_use qt5 kst_qt5)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
@ 2018-08-26 18:24 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-08-26 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 901e0196c41d8c1b57e327370c6f9bbeba4d309f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 17:37:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 18:23:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=901e0196
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
.../kst/files/kst-2.0.8-qt-5.11.patch | 46 ++++++++++++++++++++++
.../kst/files/kst-2.0.8-qt-5.11b3.patch | 25 ------------
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 00000000000..8409f6664d7
--- /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 b211e1ed21e..00000000000
--- 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 1ea474c0cee..d8c58992ca3 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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
@ 2018-08-26 18:24 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-08-26 18:24 UTC (permalink / raw
To: gentoo-commits
commit: e1b28544fe15ec757bae3c1708660bb94a4432a0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 18:07:50 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 18:23:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b28544
sci-visualization/kst: Fix build with sci-libs/gsl-2
Closes: https://bugs.gentoo.org/574746
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../kst/files/kst-2.0.8-gsl-2.0.patch | 30 ++++++++++++++++++++++
sci-visualization/kst/kst-2.0.8.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch
new file mode 100644
index 00000000000..c49ba2e20bc
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch
@@ -0,0 +1,30 @@
+Patch kindly borrowed from Debian.
+Gentoo-bug: https://bugs.gentoo.org/574746
+KDE-bug: https://bugs.kde.org/show_bug.cgi?id=355324
+
+--- a/src/plugins/fits/non_linear.h
++++ b/src/plugins/fits/non_linear.h
+@@ -177,7 +177,9 @@ bool kstfit_nonlinear(
+ }
+ iIterations++;
+ } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
+- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p);
++ gsl_multifit_fdfsolver_jac (pSolver, J);
++ gsl_multifit_covar (J, 0.0, pMatrixCovariance);
+
+ //
+ // determine the fitted values...
+--- a/src/plugins/fits/non_linear_weighted.h
++++ b/src/plugins/fits/non_linear_weighted.h
+@@ -193,7 +193,9 @@ bool kstfit_nonlinear_weighted(
+ }
+ while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
+
+- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p);
++ gsl_multifit_fdfsolver_jac (pSolver, J);
++ gsl_multifit_covar (J, 0.0, pMatrixCovariance);
+
+ //
+ // determine the fitted values...
diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild
index d8c58992ca3..6b0ac253117 100644
--- a/sci-visualization/kst/kst-2.0.8.ebuild
+++ b/sci-visualization/kst/kst-2.0.8.ebuild
@@ -44,6 +44,7 @@ DOCS=( AUTHORS README.kstScript )
PATCHES=(
"${FILESDIR}/${P}-includes.patch"
"${FILESDIR}/${P}-qt-5.11.patch"
+ "${FILESDIR}/${P}-gsl-2.0.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
@ 2021-09-07 12:52 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-09-07 12:52 UTC (permalink / raw
To: gentoo-commits
commit: 8b6c60dd4d1e2c2396b9eb4cb15de30d1a503fb5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 12:39:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 12:52:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6c60dd
sci-visualization/kst: Fix build with Qt 5.15
Thanks-to: Jérôme Borme <jerome.borme <AT> laposte.net>
Bug: https://bugs.gentoo.org/593848
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch | 10 ++++++++++
sci-visualization/kst/kst-2.0.8-r1.ebuild | 2 ++
2 files changed, 12 insertions(+)
diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch
new file mode 100644
index 00000000000..97b42a6d33c
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch
@@ -0,0 +1,10 @@
+--- a/src/widgets/gradienteditor.h 2014-02-13 09:41:44.000000000 +0000
++++ b/src/widgets/gradienteditor.h 2021-04-18 14:45:24.654148450 +0100
+@@ -16,6 +16,7 @@
+ #include <QHash>
+ #include <QWidget>
+ #include <QGradient>
++#include <QPainterPath>
+
+ #include "kstwidgets_export.h"
+
diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild
index dea0db42382..159b9f3b814 100644
--- a/sci-visualization/kst/kst-2.0.8-r1.ebuild
+++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild
@@ -45,6 +45,8 @@ PATCHES=(
"${FILESDIR}/${P}-qt-5.11.patch"
"${FILESDIR}/${P}-gsl-2.0.patch"
"${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560
+ "${FILESDIR}/${P}-getdata-drop-bogus-lib_debug.patch" # bug 593848
+ "${FILESDIR}/${P}-qt-5.15.patch" # bug 593848
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-07 12:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-07 12:52 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-08-26 18:24 Andreas Sturmlechner
2018-08-26 18:24 Andreas Sturmlechner
2015-10-31 15:57 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox