* [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; 7+ 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] 7+ 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; 7+ 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] 7+ 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; 7+ 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] 7+ 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; 7+ 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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
@ 2025-04-23 17:50 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2025-04-23 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 1d3a60bd4f4bd03d8c8d123e9dbf01e12cb9480a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 17:43:27 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 17:50:19 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3a60bd
sci-visualization/kst: Use upstream FindHDF5.cmake module
And make some minor adjustments so it actually gets picked up.
Closes: https://bugs.gentoo.org/954233
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kst-2.1.0_p20250415-cmake-findgsl.patch | 92 +++-------------------
.../files/kst-2.1.0_p20250415-cmake-findhdf5.patch | 43 ++++++++++
.../kst/kst-2.1.0_p20250415-r1.ebuild | 84 ++++++++++++++++++++
3 files changed, 137 insertions(+), 82 deletions(-)
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch
index 294590e9acad..a4d59c58f5ab 100644
--- a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch
+++ b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch
@@ -1,4 +1,4 @@
-From 219e338d31878b19560dd6ef9ce99df954501ea5 Mon Sep 17 00:00:00 2001
+From 7fbe099d763f99275e89d577a462f4195966cc0e Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 15 Apr 2025 19:59:04 +0200
Subject: [PATCH] Use CMake FindGSL module
@@ -7,11 +7,9 @@ Fixes build if /usr/include/gsl directory is polluted by ms-gsl.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
- CMakeLists.txt | 2 +-
- cmake/modules/FindGsl.cmake | 67 -------------------------------------
- src/plugins/CMakeLists.txt | 3 +-
- 3 files changed, 2 insertions(+), 70 deletions(-)
- delete mode 100644 cmake/modules/FindGsl.cmake
+ CMakeLists.txt | 4 +--
+ src/plugins/CMakeLists.txt | 5 ++-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4bc5239..bc84fbf0 100644
@@ -26,88 +24,17 @@ index a4bc5239..bc84fbf0 100644
find_package(Netcdf)
find_package(Matio)
find_package(CFITSIO)
-diff --git a/cmake/modules/FindGsl.cmake b/cmake/modules/FindGsl.cmake
-deleted file mode 100644
-index 6261e3a0..00000000
---- a/cmake/modules/FindGsl.cmake
-+++ /dev/null
-@@ -1,67 +0,0 @@
--# ***************************************************************************
--# * *
--# * Copyright : (C) 2010 The University of Toronto *
--# * email : netterfield@astro.utoronto.ca *
--# * *
--# * Copyright : (C) 2010 Peter Kümmel *
--# * email : syntheticpp@gmx.net *
--# * *
--# * This program is free software; you can redistribute it and/or modify *
--# * it under the terms of the GNU General Public License as published by *
--# * the Free Software Foundation; either version 2 of the License, or *
--# * (at your option) any later version. *
--# * *
--# ***************************************************************************
--
--# use pkg to find the library name and paths,
--# but use this iformation in find_* only
--if(NOT GSL_INCLUDEDIR)
--
--if(NOT kst_cross)
-- include(FindPkgConfig)
-- pkg_check_modules(PKGGSL QUIET gsl)
--endif()
--
--if(NOT PKGGSL_LIBRARIES)
-- set(PKGGSL_LIBRARIES gsl)
-- if (UNIX AND NOT kst_cross)
-- set(PKGGSL_LIBRARIES ${PKGGSL_LIBRARIES} m gslcblas)
-- endif()
--endif()
--
--set(GSL_INCLUDEDIR GSL_INCLUDEDIR-NOTFOUND CACHE STRING "" FORCE)
--find_path(GSL_INCLUDEDIR gsl_version.h
-- HINTS
-- ENV GSL_DIR
-- PATH_SUFFIXES include/gsl include
-- PATHS ${kst_3rdparty_dir} ${PKGGSL_INCLUDEDIR})
--
--set(GSL_LIBRARY_LIST)
--foreach(it ${PKGGSL_LIBRARIES})
-- set(lib lib-NOTFOUND CACHE STRING "" FORCE)
-- FIND_LIBRARY(lib ${it}
-- HINTS
-- ENV GSL_DIR
-- PATH_SUFFIXES lib
-- PATHS ${kst_3rdparty_dir} ${PKGGSL_LIBRARY_DIRS})
-- list(APPEND GSL_LIBRARY_LIST ${lib})
--endforeach()
--set(GSL_LIBRARIES ${GSL_LIBRARY_LIST} CACHE STRING "" FORCE)
--
--endif()
--
--if(GSL_INCLUDEDIR AND GSL_LIBRARIES)
-- set(GSL_INCLUDE_DIR ${GSL_INCLUDEDIR} ${GSL_INCLUDEDIR}/..)
-- set(gsl 1)
-- message(STATUS "Found GSL:")
-- message(STATUS " includes : ${GSL_INCLUDE_DIR}")
-- message(STATUS " libraries: ${GSL_LIBRARIES}")
--else()
-- message(STATUS "Not found: GSL.")
-- MESSAGE(STATUS " If GSL is installed outside the CMake search path,")
-- MESSAGE(STATUS " set the environmental variable GSL_DIR to the")
-- MESSAGE(STATUS " GSL install prefix.")
--endif()
--
--message(STATUS "")
--
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index 6c744f97..0f4006ca 100644
+index 6c744f97..c5929d88 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
-@@ -31,10 +31,9 @@ kst_add_plugin(filters differentiation)
+@@ -30,11 +30,10 @@ kst_add_plugin(filters window)
+ kst_add_plugin(filters differentiation)
kst_add_plugin(filters exponential)
- if(gsl)
+-if(gsl)
- include_directories(${GSL_INCLUDE_DIR})
++if(GSL_FOUND)
macro(kst_add_gsl_plugin dir name)
kst_add_plugin(${dir} ${name})
- kst_link(${GSL_LIBRARIES})
@@ -117,3 +44,4 @@ index 6c744f97..0f4006ca 100644
kst_add_gsl_plugin(dataobject/convolution convolve)
--
2.49.0
+
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch
new file mode 100644
index 000000000000..b9b9c77e1e0e
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch
@@ -0,0 +1,43 @@
+From 58ea6c63dd800ebeb9f0b12744e4de87e8d372b5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 23 Apr 2025 19:07:28 +0200
+Subject: [PATCH] Use CMake provided FindHDF5 module
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ src/datasources/CMakeLists.txt | 6 +--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc84fbf0..db9c09fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,7 +166,7 @@ if(kst_3rdparty)
+ find_package(Matio)
+ find_package(CFITSIO)
+ find_package(LibTiff)
+- find_package(HDF5)
++ find_package(HDF5 COMPONENTS CXX)
+ message(STATUS "----------------------------------------------")
+ else()
+ message(STATUS "Building plugins depending on 3rd party libraries suppressed")
+diff --git a/src/datasources/CMakeLists.txt b/src/datasources/CMakeLists.txt
+index f72c44b0..12da98c8 100644
+--- a/src/datasources/CMakeLists.txt
++++ b/src/datasources/CMakeLists.txt
+@@ -73,8 +73,8 @@ if(tiff)
+ kst_link(${TIFF_LIBRARIES})
+ endif()
+
+-if(hdf5)
+- include_directories(${HDF5_INCLUDEDIR})
++if(HDF5_FOUND)
++ include_directories(${HDF5_CXX_INCLUDE_DIRS})
+ kst_add_plugin(. hdf5)
+- kst_link(${HDF5_LIBRARIES})
++ kst_link(${HDF5_CXX_LIBRARIES})
+ endif()
+--
+2.49.0
+
diff --git a/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild b/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild
new file mode 100644
index 000000000000..f586eefa1b9b
--- /dev/null
+++ b/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindGsl FindHDF5 )
+KDE_ORG_CATEGORY=graphics
+KDE_ORG_NAME=kst-plot
+KDE_ORG_COMMIT=16334f6f99613a1b60873d93835f9083dca258b2
+inherit cmake flag-o-matic kde.org xdg
+
+DESCRIPTION="Fast real-time large-dataset viewing and plotting tool"
+HOMEPAGE="https://kst-plot.kde.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RESTRICT="test"
+
+RDEPEND="
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/tiff:=
+ sci-libs/cfitsio:=
+ sci-libs/getdata[cxx]
+ sci-libs/gsl:=
+ sci-libs/hdf5:=[cxx]
+ sci-libs/matio:=
+ sci-libs/netcdf-cxx:3
+"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS README.kstScript )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.8-getdata-drop-bogus-lib_debug.patch # bug #593848
+ "${FILESDIR}"/${P}-cmake4.patch # thx opensuse
+ "${FILESDIR}"/${P}-cmake-{findgsl,findhdf5}.patch # bugs #884625, #954233
+ "${FILESDIR}"/${P}-hdf5cxx.patch # thx opensuse
+)
+
+src_prepare() {
+ rm -r cmake/3rdparty || die
+
+ cmake_src_prepare
+
+ sed -e "/^kst_revision_project_name/ s/^/# removed by ebuild: /" \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # -Werror=odr, -Werror=lto-type=-mismatch
+ # https://bugs.gentoo.org/863296
+ # https://bugs.kde.org/show_bug.cgi?id=484572
+ filter-lto
+
+ local mycmakeargs=(
+ -Dkst_install_libdir="$(get_libdir)"
+ -Dkst_revision=${PV/*_p/-}
+ -Dkst_dbgsym=ON
+ -Dkst_pch=OFF
+ -Dkst_python=OFF
+ -Dkst_qt5=ON
+ -Dkst_qt4=OFF
+ -Dkst_rpath=OFF
+ -Dkst_svnversion=OFF
+ -Dkst_verbose=ON
+ -Dkst_release=$(usex debug OFF ON)
+ -Dkst_test=$(usex test)
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
@ 2025-08-30 16:16 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2025-08-30 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 13b7d2e0446512c2d62e2cfb517aa47dbe7ab351
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 30 15:08:24 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 30 16:15:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b7d2e0
sci-visualization/kst: drop 2.1.0_p20250415-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-visualization/kst/Manifest | 1 -
.../files/kst-2.1.0_p20250415-cmake-findgsl.patch | 47 ------------
.../files/kst-2.1.0_p20250415-cmake-findhdf5.patch | 43 -----------
.../kst/files/kst-2.1.0_p20250415-cmake4.patch | 83 ---------------------
.../kst/files/kst-2.1.0_p20250415-hdf5cxx.patch | 20 ------
.../kst/kst-2.1.0_p20250415-r1.ebuild | 84 ----------------------
6 files changed, 278 deletions(-)
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index aae93bd695f5..2e41b364b13d 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,2 +1 @@
-DIST kst-plot-2.1.0_p20250415-16334f6f.tar.gz 18814920 BLAKE2B 4a0f609bff3e9c1bd512d04e7a4725d89cb34f0fcc606c704439281c065a5c20fc7e81272837604a858e4f91e73e6b8f0ea584591aa55fdf6ee37661e9434d4d SHA512 9a8b37c748d96bbaf878da7a9b9479387e83a1db39226867e3439e999fe9e66ec27f021194b0610759d5380ab934d6292c005500fdafd783ba9a939ce579a19c
DIST kst-plot-2.1.0_p20250830-c250288d.tar.gz 18814925 BLAKE2B 1fb5f6bec36c5baa9bd19400efc3ccd84479c6985138d1e03ccc2b21d7705b77e6dbac932303c89367044a0d014cbc562d231215c5584860ab2b926a2f78bab7 SHA512 3482d914b04fd477bbcf813761b1f6b57c787fea13cc5df5bdb62cee2172d8859f6fc831cf1cc7d650a86080807e8e66f3744d9ea7bf8d14f410af8994283f1f
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch
deleted file mode 100644
index a4d59c58f5ab..000000000000
--- a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7fbe099d763f99275e89d577a462f4195966cc0e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 15 Apr 2025 19:59:04 +0200
-Subject: [PATCH] Use CMake FindGSL module
-
-Fixes build if /usr/include/gsl directory is polluted by ms-gsl.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 4 +--
- src/plugins/CMakeLists.txt | 5 ++-
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4bc5239..bc84fbf0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -161,7 +161,7 @@ endif()
- if(kst_3rdparty)
- message(STATUS "3rd party libs for plugins--------------------")
- find_package(Getdata)
-- find_package(Gsl)
-+ find_package(GSL)
- find_package(Netcdf)
- find_package(Matio)
- find_package(CFITSIO)
-diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index 6c744f97..c5929d88 100644
---- a/src/plugins/CMakeLists.txt
-+++ b/src/plugins/CMakeLists.txt
-@@ -30,11 +30,10 @@ kst_add_plugin(filters window)
- kst_add_plugin(filters differentiation)
- kst_add_plugin(filters exponential)
-
--if(gsl)
-- include_directories(${GSL_INCLUDE_DIR})
-+if(GSL_FOUND)
- macro(kst_add_gsl_plugin dir name)
- kst_add_plugin(${dir} ${name})
-- kst_link(${GSL_LIBRARIES})
-+ kst_link(GSL::gsl)
- endmacro()
-
- kst_add_gsl_plugin(dataobject/convolution convolve)
---
-2.49.0
-
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch
deleted file mode 100644
index b9b9c77e1e0e..000000000000
--- a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 58ea6c63dd800ebeb9f0b12744e4de87e8d372b5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 23 Apr 2025 19:07:28 +0200
-Subject: [PATCH] Use CMake provided FindHDF5 module
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- src/datasources/CMakeLists.txt | 6 +--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc84fbf0..db9c09fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -166,7 +166,7 @@ if(kst_3rdparty)
- find_package(Matio)
- find_package(CFITSIO)
- find_package(LibTiff)
-- find_package(HDF5)
-+ find_package(HDF5 COMPONENTS CXX)
- message(STATUS "----------------------------------------------")
- else()
- message(STATUS "Building plugins depending on 3rd party libraries suppressed")
-diff --git a/src/datasources/CMakeLists.txt b/src/datasources/CMakeLists.txt
-index f72c44b0..12da98c8 100644
---- a/src/datasources/CMakeLists.txt
-+++ b/src/datasources/CMakeLists.txt
-@@ -73,8 +73,8 @@ if(tiff)
- kst_link(${TIFF_LIBRARIES})
- endif()
-
--if(hdf5)
-- include_directories(${HDF5_INCLUDEDIR})
-+if(HDF5_FOUND)
-+ include_directories(${HDF5_CXX_INCLUDE_DIRS})
- kst_add_plugin(. hdf5)
-- kst_link(${HDF5_LIBRARIES})
-+ kst_link(${HDF5_CXX_LIBRARIES})
- endif()
---
-2.49.0
-
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch
deleted file mode 100644
index 821796fcd189..000000000000
--- a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-https://build.opensuse.org/projects/openSUSE:Factory/packages/kst/files/kst-cmake4.patch
-
-From 938ba7f91685c5d4261291f0b7ab5e986edc5a3e Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe@krop.fr>
-Date: Tue, 1 Apr 2025 16:02:59 +0200
-Subject: [PATCH] Fix build with CMake 4
-
----
- CMakeLists.txt | 41 ++++++++++++++++-------------------------
- 1 file changed, 16 insertions(+), 25 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4bc523..dce0253 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,19 @@
--cmake_minimum_required(VERSION 3.0.0)
-+cmake_minimum_required(VERSION 3.16)
-+
-+set(kst_version_major 2)
-+if(kst_version_string)
-+ set(kst_version ${kst_version_string})
-+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${kst_version}")
-+else()
-+ set(kst_version_minor 1)
-+ #set(kst_version_patch x)
-+ set(kst_version ${kst_version_major}.${kst_version_minor})
-+ #set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
-+ set(kst_version_string ${kst_version})
-+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Kst ${kst_version}")
-+endif()
-+
-+project(Kst VERSION ${kst_version})
-
- if(kst_clang)
- set(CMAKE_C_COMPILER "clang")
-@@ -6,14 +21,6 @@ if(kst_clang)
- message(STATUS "Using clang ${CMAKE_CXX_COMPILER}")
- endif()
-
--if(POLICY CMP0020)
-- cmake_policy(SET CMP0020 OLD)
--endif()
--
--if(${CMAKE_MAJOR_VERSION} EQUAL 3)
-- cmake_policy(SET CMP0043 OLD)
--endif()
--
- # figure out if we use MinGW with Ninja: call with -DCC=gcc
- if(WIN32 AND CMAKE_GENERATOR MATCHES Ninja AND CC MATCHES gcc)
- find_file(mingw_make mingw32-make.exe)
-@@ -69,9 +76,6 @@ if(kst_cross)
- endif()
-
-
--project(Kst)
--
--
- if(kst_release)
- set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_WARNING_OUTPUT")
-@@ -87,19 +91,6 @@ if(kst_sanitize)
- endif()
-
-
--set(kst_version_major 2)
--if(kst_version_string)
-- set(kst_version ${kst_version_string})
-- set(CPACK_PACKAGE_INSTALL_DIRECTORY "${kst_version}")
--else()
-- set(kst_version_minor 1)
-- #set(kst_version_patch x)
-- set(kst_version ${kst_version_major}.${kst_version_minor})
-- #set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
-- set(kst_version_string ${kst_version})
-- set(CPACK_PACKAGE_INSTALL_DIRECTORY "Kst ${kst_version}")
--endif()
--
- if(CMAKE_COMPILER_IS_GNUCC)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
- message(STATUS "Using GCC version ${GCC_VERSION}")
---
-2.49.0
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-hdf5cxx.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-hdf5cxx.patch
deleted file mode 100644
index 259fa72b4f9d..000000000000
--- a/sci-visualization/kst/files/kst-2.1.0_p20250415-hdf5cxx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://build.opensuse.org/projects/openSUSE:Factory/packages/kst/files/fix-hdf5-include-path.patch
-
-Subject: Fix a header path
-From: Antonio Larrosa <alarrosa@suse.com>
-
-We install H5Cpp.h in /usr/include so we need to fix the include line.
-
-Index: kst-plot/src/datasources/hdf5/hdf5.h
-===================================================================
---- a/src/datasources/hdf5/hdf5.h
-+++ b/src/datasources/hdf5/hdf5.h
-@@ -18,7 +18,7 @@
- #include <dataplugin.h>
-
- #include <QFileInfo>
--#include <hdf5/serial/H5Cpp.h>
-+#include <H5Cpp.h>
- #include <exception>
-
- #include "debug.h"
diff --git a/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild b/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild
deleted file mode 100644
index f586eefa1b9b..000000000000
--- a/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindGsl FindHDF5 )
-KDE_ORG_CATEGORY=graphics
-KDE_ORG_NAME=kst-plot
-KDE_ORG_COMMIT=16334f6f99613a1b60873d93835f9083dca258b2
-inherit cmake flag-o-matic kde.org xdg
-
-DESCRIPTION="Fast real-time large-dataset viewing and plotting tool"
-HOMEPAGE="https://kst-plot.kde.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RESTRICT="test"
-
-RDEPEND="
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/tiff:=
- sci-libs/cfitsio:=
- sci-libs/getdata[cxx]
- sci-libs/gsl:=
- sci-libs/hdf5:=[cxx]
- sci-libs/matio:=
- sci-libs/netcdf-cxx:3
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( AUTHORS README.kstScript )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.8-getdata-drop-bogus-lib_debug.patch # bug #593848
- "${FILESDIR}"/${P}-cmake4.patch # thx opensuse
- "${FILESDIR}"/${P}-cmake-{findgsl,findhdf5}.patch # bugs #884625, #954233
- "${FILESDIR}"/${P}-hdf5cxx.patch # thx opensuse
-)
-
-src_prepare() {
- rm -r cmake/3rdparty || die
-
- cmake_src_prepare
-
- sed -e "/^kst_revision_project_name/ s/^/# removed by ebuild: /" \
- -i CMakeLists.txt || die
-}
-
-src_configure() {
- # -Werror=odr, -Werror=lto-type=-mismatch
- # https://bugs.gentoo.org/863296
- # https://bugs.kde.org/show_bug.cgi?id=484572
- filter-lto
-
- local mycmakeargs=(
- -Dkst_install_libdir="$(get_libdir)"
- -Dkst_revision=${PV/*_p/-}
- -Dkst_dbgsym=ON
- -Dkst_pch=OFF
- -Dkst_python=OFF
- -Dkst_qt5=ON
- -Dkst_qt4=OFF
- -Dkst_rpath=OFF
- -Dkst_svnversion=OFF
- -Dkst_verbose=ON
- -Dkst_release=$(usex debug OFF ON)
- -Dkst_test=$(usex test)
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
@ 2025-08-30 16:16 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2025-08-30 16:16 UTC (permalink / raw
To: gentoo-commits
commit: d4b0f3bd49087baa53c0b693c54e0a0b10c825af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 30 14:58:58 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 30 16:15:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b0f3bd
sci-visualization/kst: add 2.1.0_p20250830, don't compress manpages
Bug: https://bugs.gentoo.org/812017
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-visualization/kst/Manifest | 1 +
.../files/kst-2.1.0_p20250830-cmake-findhdf5.patch | 43 +++++++++++
.../kst-2.1.0_p20250830-no-compress-man.patch | 31 ++++++++
sci-visualization/kst/kst-2.1.0_p20250830.ebuild | 83 ++++++++++++++++++++++
4 files changed, 158 insertions(+)
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index 6ac77b381ddd..aae93bd695f5 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1 +1,2 @@
DIST kst-plot-2.1.0_p20250415-16334f6f.tar.gz 18814920 BLAKE2B 4a0f609bff3e9c1bd512d04e7a4725d89cb34f0fcc606c704439281c065a5c20fc7e81272837604a858e4f91e73e6b8f0ea584591aa55fdf6ee37661e9434d4d SHA512 9a8b37c748d96bbaf878da7a9b9479387e83a1db39226867e3439e999fe9e66ec27f021194b0610759d5380ab934d6292c005500fdafd783ba9a939ce579a19c
+DIST kst-plot-2.1.0_p20250830-c250288d.tar.gz 18814925 BLAKE2B 1fb5f6bec36c5baa9bd19400efc3ccd84479c6985138d1e03ccc2b21d7705b77e6dbac932303c89367044a0d014cbc562d231215c5584860ab2b926a2f78bab7 SHA512 3482d914b04fd477bbcf813761b1f6b57c787fea13cc5df5bdb62cee2172d8859f6fc831cf1cc7d650a86080807e8e66f3744d9ea7bf8d14f410af8994283f1f
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250830-cmake-findhdf5.patch b/sci-visualization/kst/files/kst-2.1.0_p20250830-cmake-findhdf5.patch
new file mode 100644
index 000000000000..cfc3bb33f074
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.1.0_p20250830-cmake-findhdf5.patch
@@ -0,0 +1,43 @@
+From 58ea6c63dd800ebeb9f0b12744e4de87e8d372b5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 23 Apr 2025 19:07:28 +0200
+Subject: [PATCH] Use CMake provided FindHDF5 module
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ src/datasources/CMakeLists.txt | 6 +--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc84fbf0..db9c09fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,7 +166,7 @@ if(kst_3rdparty)
+ find_package(Matio)
+ find_package(CFITSIO)
+ find_package(TIFF)
+- find_package(HDF5)
++ find_package(HDF5 COMPONENTS CXX)
+ message(STATUS "----------------------------------------------")
+ else()
+ message(STATUS "Building plugins depending on 3rd party libraries suppressed")
+diff --git a/src/datasources/CMakeLists.txt b/src/datasources/CMakeLists.txt
+index f72c44b0..12da98c8 100644
+--- a/src/datasources/CMakeLists.txt
++++ b/src/datasources/CMakeLists.txt
+@@ -73,8 +73,8 @@ if(tiff)
+ kst_link(${TIFF_LIBRARIES})
+ endif()
+
+-if(hdf5)
+- include_directories(${HDF5_INCLUDEDIR})
++if(HDF5_FOUND)
++ include_directories(${HDF5_CXX_INCLUDE_DIRS})
+ kst_add_plugin(. hdf5)
+- kst_link(${HDF5_LIBRARIES})
++ kst_link(${HDF5_CXX_LIBRARIES})
+ endif()
+--
+2.49.0
+
diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250830-no-compress-man.patch b/sci-visualization/kst/files/kst-2.1.0_p20250830-no-compress-man.patch
new file mode 100644
index 000000000000..5a92c7ec87f5
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.1.0_p20250830-no-compress-man.patch
@@ -0,0 +1,31 @@
+From cb89bb697a7d973ab1c9e5593ad4a14f8964649e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 30 Aug 2025 17:28:31 +0200
+Subject: [PATCH] Do not compress man pages
+
+Let distributions do that.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/kst/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/kst/CMakeLists.txt b/src/kst/CMakeLists.txt
+index ac100ac1..b6eca51d 100644
+--- a/src/kst/CMakeLists.txt
++++ b/src/kst/CMakeLists.txt
+@@ -38,9 +38,8 @@ kst_install_executable()
+ if(UNIX AND NOT APPLE)
+ set(man ${CMAKE_BINARY_DIR}/${kst_binary_name}.1)
+ configure_file(${kst_dir}/src/kst/kst.1.txt ${man})
+- install(CODE "execute_process(COMMAND gzip ${man})")
+- set_source_files_properties(${man}.gz PROPERTIES GENERATED TRUE)
+- install(FILES ${man}.gz DESTINATION share/man/man1)
++ set_source_files_properties(${man} PROPERTIES GENERATED TRUE)
++ install(FILES ${man} DESTINATION share/man/man1)
+
+ set(k ${kst_dir}/src/kst)
+ # install(FILES ${k}/kstplugin.desktop
+--
+2.51.0
+
diff --git a/sci-visualization/kst/kst-2.1.0_p20250830.ebuild b/sci-visualization/kst/kst-2.1.0_p20250830.ebuild
new file mode 100644
index 000000000000..0bea56ac9795
--- /dev/null
+++ b/sci-visualization/kst/kst-2.1.0_p20250830.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindHDF5 )
+KDE_ORG_CATEGORY=graphics
+KDE_ORG_NAME=kst-plot
+KDE_ORG_COMMIT=c250288dcae3b476d55321b935fbaab5dec6b28b
+inherit cmake flag-o-matic kde.org xdg
+
+DESCRIPTION="Fast real-time large-dataset viewing and plotting tool"
+HOMEPAGE="https://kst-plot.kde.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RESTRICT="test"
+
+RDEPEND="
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/tiff:=
+ sci-libs/cfitsio:=
+ sci-libs/getdata[cxx]
+ sci-libs/gsl:=
+ sci-libs/hdf5:=[cxx]
+ sci-libs/matio:=
+ sci-libs/netcdf-cxx:3
+"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS README.kstScript )
+
+PATCHES=(
+ # downstream patches
+ "${FILESDIR}"/${PN}-2.0.8-getdata-drop-bogus-lib_debug.patch # bug #593848
+ "${FILESDIR}"/${P}-cmake-findhdf5.patch # bug #954233
+ "${FILESDIR}"/${P}-no-compress-man.patch # bug #812017
+)
+
+src_prepare() {
+ rm -r cmake/3rdparty || die
+ rm -r pyKst || die # unused w/ -Dkst_python=OFF below
+
+ cmake_src_prepare
+
+ sed -e "/^kst_revision_project_name/ s/^/# removed by ebuild: /" \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # -Werror=odr, -Werror=lto-type=-mismatch
+ # https://bugs.gentoo.org/863296
+ # https://bugs.kde.org/show_bug.cgi?id=484572
+ filter-lto
+
+ local mycmakeargs=(
+ -Dkst_install_libdir="$(get_libdir)"
+ -Dkst_revision=${PV/*_p/-}
+ -Dkst_dbgsym=ON
+ -Dkst_pch=OFF
+ -Dkst_python=OFF
+ -Dkst_rpath=OFF
+ -Dkst_svnversion=OFF
+ -Dkst_verbose=ON
+ -Dkst_release=$(usex debug OFF ON)
+ -Dkst_test=$(usex test)
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-08-30 16:16 UTC | newest]
Thread overview: 7+ 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 --
2025-08-30 16:16 Andreas Sturmlechner
2025-08-30 16:16 Andreas Sturmlechner
2025-04-23 17:50 Andreas Sturmlechner
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