* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
@ 2016-09-14 20:45 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-09-14 20:45 UTC (permalink / raw
To: gentoo-commits
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=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
@ 2018-06-12 7:33 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-06-12 7:33 UTC (permalink / raw
To: gentoo-commits
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=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
@ 2021-09-07 12:52 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-09-07 12:52 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
@ 2025-04-15 22:06 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-04-15 22:06 UTC (permalink / raw
To: gentoo-commits
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 <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 | 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 : 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
+--- 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 <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
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 <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.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>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
@ 2025-04-15 22:06 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-04-15 22:06 UTC (permalink / raw
To: gentoo-commits
commit: d79bab5ce85c2c70d5bf742426d49aed9a4f6f10
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 15 22:02:28 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=d79bab5c
sci-visualization/kst: drop 2.0.8-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-visualization/kst/Manifest | 1 -
.../kst/files/kst-2.0.8-cmake-3.20.patch | 32 ---------
.../kst/files/kst-2.0.8-gsl-2.0.patch | 30 ---------
.../kst/files/kst-2.0.8-includes.patch | 25 -------
.../kst/files/kst-2.0.8-qt-5.11.patch | 46 -------------
.../kst/files/kst-2.0.8-qt-5.15.patch | 10 ---
sci-visualization/kst/kst-2.0.8-r2.ebuild | 77 ----------------------
7 files changed, 221 deletions(-)
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index 8bab32da2136..6ac77b381ddd 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,2 +1 @@
-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.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
deleted file mode 100644
index 39e2df7d0a64..000000000000
--- a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/files/kst-2.0.8-gsl-2.0.patch b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch
deleted file mode 100644
index c49ba2e20bca..000000000000
--- a/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/files/kst-2.0.8-includes.patch b/sci-visualization/kst/files/kst-2.0.8-includes.patch
deleted file mode 100644
index 113d9dcc807d..000000000000
--- a/sci-visualization/kst/files/kst-2.0.8-includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/files/kst-2.0.8-qt-5.11.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch
deleted file mode 100644
index 8409f6664d73..000000000000
--- a/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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.15.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch
deleted file mode 100644
index 97b42a6d33c2..000000000000
--- a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-r2.ebuild b/sci-visualization/kst/kst-2.0.8-r2.ebuild
deleted file mode 100644
index 5cb76ab292a8..000000000000
--- a/sci-visualization/kst/kst-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=Kst-${PV}
-inherit cmake flag-o-matic xdg-utils
-
-DESCRIPTION="Fast real-time large-dataset viewing and plotting tool"
-HOMEPAGE="https://kst-plot.kde.org/ https://invent.kde.org/graphics/kst-plot"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-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/qtwidgets:5
- dev-qt/qtxml:5
- sci-libs/cfitsio:=
- sci-libs/getdata[cxx]
- sci-libs/gsl:=
- 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}/${P}-includes.patch"
- "${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() {
- # -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_pch=OFF
- -Dkst_qt5=ON
- -Dkst_release=$(usex debug OFF ON)
- -Dkst_rpath=OFF
- -Dkst_svnversion=OFF
- -Dkst_test=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-04-15 22:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-12 7:33 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-04-15 22:06 Andreas Sturmlechner
2025-04-15 22:06 Andreas Sturmlechner
2021-09-07 12:52 Andreas Sturmlechner
2016-09-14 20:45 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox