commit: dfd4fdec02bc89e05b417bc768ee249e41a10985 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 15 21:54:42 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Apr 15 22:06:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd4fdec
sci-visualization/kst: add 2.1.0_p20250415 Closes: https://bugs.gentoo.org/884625 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-visualization/kst/Manifest | 1 + .../files/kst-2.1.0_p20250415-cmake-findgsl.patch | 119 +++++++++++++++++++++ .../kst/files/kst-2.1.0_p20250415-cmake4.patch | 83 ++++++++++++++ .../kst/files/kst-2.1.0_p20250415-hdf5cxx.patch | 20 ++++ sci-visualization/kst/kst-2.1.0_p20250415.ebuild | 82 ++++++++++++++ sci-visualization/kst/metadata.xml | 4 +- 6 files changed, 307 insertions(+), 2 deletions(-) diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest index 83c2adac80b0..8bab32da2136 100644 --- a/sci-visualization/kst/Manifest +++ b/sci-visualization/kst/Manifest @@ -1 +1,2 @@ DIST Kst-2.0.8.tar.gz 14527129 BLAKE2B 5330dc97bc56bf8c6120a461e078ed1bdf87c4ec41b6f6ddc13d7500fde0d1b973b42da8f38c738d133559696d89ad579c288206c7ba07bbfd22dbc2bf6f2064 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb +DIST kst-plot-2.1.0_p20250415-16334f6f.tar.gz 18814920 BLAKE2B 4a0f609bff3e9c1bd512d04e7a4725d89cb34f0fcc606c704439281c065a5c20fc7e81272837604a858e4f91e73e6b8f0ea584591aa55fdf6ee37661e9434d4d SHA512 9a8b37c748d96bbaf878da7a9b9479387e83a1db39226867e3439e999fe9e66ec27f021194b0610759d5380ab934d6292c005500fdafd783ba9a939ce579a19c 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 new file mode 100644 index 000000000000..294590e9acad --- /dev/null +++ b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch @@ -0,0 +1,119 @@ +From 219e338d31878b19560dd6ef9ce99df954501ea5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +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 <[email protected]> +--- + 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 + +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/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 : [email protected] * +-# * * +-# * Copyright : (C) 2010 Peter Kümmel * +-# * email : [email protected] * +-# * * +-# * 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 +--- a/src/plugins/CMakeLists.txt ++++ b/src/plugins/CMakeLists.txt +@@ -31,10 +31,9 @@ kst_add_plugin(filters differentiation) + kst_add_plugin(filters exponential) + + if(gsl) +- include_directories(${GSL_INCLUDE_DIR}) + 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-cmake4.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch new file mode 100644 index 000000000000..821796fcd189 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch @@ -0,0 +1,83 @@ +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 <[email protected]> +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 new file mode 100644 index 000000000000..259fa72b4f9d --- /dev/null +++ b/sci-visualization/kst/files/kst-2.1.0_p20250415-hdf5cxx.patch @@ -0,0 +1,20 @@ +https://build.opensuse.org/projects/openSUSE:Factory/packages/kst/files/fix-hdf5-include-path.patch + +Subject: Fix a header path +From: Antonio Larrosa <[email protected]> + +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.ebuild b/sci-visualization/kst/kst-2.1.0_p20250415.ebuild new file mode 100644 index 000000000000..89d38515ee53 --- /dev/null +++ b/sci-visualization/kst/kst-2.1.0_p20250415.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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}-cmake{4,-findgsl}.patch # bug #884625; thx opensuse + "${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 +} diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml index 132eded51dea..477a6a39ca2b 100644 --- a/sci-visualization/kst/metadata.xml +++ b/sci-visualization/kst/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="sourceforge">kst</remote-id> - <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">graphics/kst-plot</remote-id> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kst</bugs-to> </upstream> </pkgmetadata>
