science/kst2: update to 20240825 snapshot

7 files changed, 34 insertions, 90 deletions

diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 8c04253c5353..395202c7cd5c 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	kst
 DISTVERSION=	${KST_VERSION}.${KST_DATE}
-PORTREVISION=	5
 CATEGORIES=	science
 
 MAINTAINER=	makc@FreeBSD.org
@@ -23,16 +22,15 @@ USE_QT=		concurrent core gui network printsupport svg widgets xml \
 USE_LDCONFIG=	yes
 
 KST_VERSION=	2.0.8
-KST_DATE=	20220216
-KST_COMMIT=	40cdf2d3
-KDE_INVENT=	40cdf2d397e4277ee7226188ef89ae3e0f12d884 graphics kst-plot
+KST_DATE=	20240825
+KST_COMMIT=	917ad3c3
+KDE_INVENT=	917ad3c348d2e99666f11a27400b08a88dc7e590 graphics kst-plot
 
 CMAKE_ARGS=	-Dkst_install_prefix=${PREFIX} \
 		-Dkst_pch=off \
 		-Dkst_version_string=${KST_VERSION} \
 		-Dkst_revision="${KST_COMMIT} ${KST_DATE}" \
-		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON \
-		-Dkst_qt5=on
+		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON
 
 PLIST_SUB=	SHLIB_VER=${KST_VERSION}
 
diff --git a/science/kst2/distinfo b/science/kst2/distinfo
index 00eb7a0ce55e..b06b533d84b5 100644
--- a/science/kst2/distinfo
+++ b/science/kst2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646996686
-SHA256 (graphics-kst-plot-40cdf2d397e4277ee7226188ef89ae3e0f12d884_GL0.tar.gz) = cf6c0b33d915906593cd7613246f4679dcdefecb7e50b67812eeb57866e37ab8
-SIZE (graphics-kst-plot-40cdf2d397e4277ee7226188ef89ae3e0f12d884_GL0.tar.gz) = 18794059
+TIMESTAMP = 1725286631
+SHA256 (graphics-kst-plot-917ad3c348d2e99666f11a27400b08a88dc7e590_GL0.tar.gz) = c378f4062335348c0e091b1134407bec0a4a1a5dfde8d62426c8b036b88d3fb0
+SIZE (graphics-kst-plot-917ad3c348d2e99666f11a27400b08a88dc7e590_GL0.tar.gz) = 18807972
diff --git a/science/kst2/files/patch-CMakeLists.txt b/science/kst2/files/patch-CMakeLists.txt
index a5a4d70c7be2..ba87f62b626b 100644
--- a/science/kst2/files/patch-CMakeLists.txt
+++ b/science/kst2/files/patch-CMakeLists.txt
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig	2021-01-24 05:51:19 UTC
+--- CMakeLists.txt.orig	2024-08-25 02:15:46 UTC
 +++ CMakeLists.txt
-@@ -72,12 +72,6 @@ endif()
+@@ -12,6 +12,7 @@ if(${CMAKE_MAJOR_VERSION} EQUAL 3)
+ 
+ if(${CMAKE_MAJOR_VERSION} EQUAL 3)
+     cmake_policy(SET CMP0043 OLD)
++    cmake_policy(SET CMP0046 OLD)
+ endif()
+ 
+ # figure out if we use MinGW with Ninja: call with -DCC=gcc
+@@ -72,12 +73,6 @@ project(Kst)
  project(Kst)
  
  
@@ -13,7 +21,7 @@
  
  
  if(kst_sanitize)
-@@ -240,11 +234,6 @@ message(STATUS)
+@@ -240,11 +235,6 @@ message(STATUS)
  # React on options
  
  
diff --git a/science/kst2/files/patch-cmake_modules_FindHDF5.cmake b/science/kst2/files/patch-cmake_modules_FindHDF5.cmake
new file mode 100644
index 000000000000..432635ca2027
--- /dev/null
+++ b/science/kst2/files/patch-cmake_modules_FindHDF5.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/FindHDF5.cmake.orig	2024-08-25 02:15:46 UTC
++++ cmake/modules/FindHDF5.cmake
+@@ -22,7 +22,7 @@ if(NOT HDF5_INCLUDEDIR)
+   endif()
+ 
+   if(HDF5_INCLUDEDIR AND HDF5_LIBRARIES)
+-    FIND_LIBRARY(HDF5_LIBRARY_CPP hdf5_c++
++    FIND_LIBRARY(HDF5_LIBRARY_CPP hdf5_c++ hdf5_cpp
+       HINTS ${HDF5_LIBRARY_DIRS})
+     set(HDF5_LIBRARY_C -L${HDF5_LIBRARY_DIRS} ${HDF5_LIBRARIES} CACHE STRING "" FORCE)
+   else()
diff --git a/science/kst2/files/patch-src_datasources_hdf5_hdf5.h b/science/kst2/files/patch-src_datasources_hdf5_hdf5.h
index 0d59b26c7a7d..64fd2489d20e 100644
--- a/science/kst2/files/patch-src_datasources_hdf5_hdf5.h
+++ b/science/kst2/files/patch-src_datasources_hdf5_hdf5.h
@@ -1,15 +1,6 @@
---- src/datasources/hdf5/hdf5.h.orig	2022-02-16 19:03:30 UTC
+--- src/datasources/hdf5/hdf5.h.orig	2024-08-25 02:15:46 UTC
 +++ src/datasources/hdf5/hdf5.h
-@@ -11,14 +11,14 @@
-  ***************************************************************************/
- 
- 
--#ifndef HDF5_H
--#define HDF5_H
-+#ifndef KST2_HDF5_H
-+#define KST2_HDF5_H
- 
- #include <datasource.h>
+@@ -18,7 +18,7 @@
  #include <dataplugin.h>
  
  #include <QFileInfo>
diff --git a/science/kst2/files/patch-src_libkstmath_escan.cpp b/science/kst2/files/patch-src_libkstmath_escan.cpp
index 4dc880e4ce7d..da9c32d4cb63 100644
--- a/science/kst2/files/patch-src_libkstmath_escan.cpp
+++ b/science/kst2/files/patch-src_libkstmath_escan.cpp
@@ -1,72 +1,5 @@
 --- src/libkstmath/escan.cpp.orig	2022-02-16 19:03:30 UTC
 +++ src/libkstmath/escan.cpp
-@@ -691,9 +691,9 @@ extern int yylex (void);
-  */
- YY_DECL
- {
--	register yy_state_type yy_current_state;
--	register char *yy_cp, *yy_bp;
--	register int yy_act;
-+	yy_state_type yy_current_state;
-+	char *yy_cp, *yy_bp;
-+	int yy_act;
-     
- #line 21 "escan.l"
- 
-@@ -742,7 +742,7 @@ YY_DECL
- yy_match:
- 		do
- 			{
--			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
- 			if ( yy_accept[yy_current_state] )
- 				{
- 				(yy_last_accepting_state) = yy_current_state;
-@@ -1130,9 +1130,9 @@ ECHO;
-  */
- static int yy_get_next_buffer (void)
- {
--    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
--	register char *source = (yytext_ptr);
--	register int number_to_move, i;
-+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-+	char *source = (yytext_ptr);
-+	int number_to_move, i;
- 	int ret_val;
- 
- 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-@@ -1264,14 +1264,14 @@ static int yy_get_next_buffer (void)
- 
-     static yy_state_type yy_get_previous_state (void)
- {
--	register yy_state_type yy_current_state;
--	register char *yy_cp;
-+	yy_state_type yy_current_state;
-+	char *yy_cp;
-     
- 	yy_current_state = (yy_start);
- 
- 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
- 		{
--		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
- 		if ( yy_accept[yy_current_state] )
- 			{
- 			(yy_last_accepting_state) = yy_current_state;
-@@ -1296,10 +1296,10 @@ static int yy_get_next_buffer (void)
-  */
-     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
- {
--	register int yy_is_jam;
--    	register char *yy_cp = (yy_c_buf_p);
-+	int yy_is_jam;
-+    	char *yy_cp = (yy_c_buf_p);
- 
--	register YY_CHAR yy_c = 1;
-+	YY_CHAR yy_c = 1;
- 	if ( yy_accept[yy_current_state] )
- 		{
- 		(yy_last_accepting_state) = yy_current_state;
 @@ -1317,9 +1317,9 @@ static int yy_get_next_buffer (void)
  	return yy_is_jam ? 0 : yy_current_state;
  }
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index b7cee2d240ff..1b0bba95f4fe 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -41,7 +41,10 @@ lib/kst2/plugins/libkst2_filters_cumulativeaverage.so
 lib/kst2/plugins/libkst2_filters_cumulativesum.so
 lib/kst2/plugins/libkst2_filters_despike.so
 lib/kst2/plugins/libkst2_filters_differentiation.so
+lib/kst2/plugins/libkst2_filters_exponential.so
 lib/kst2/plugins/libkst2_filters_flag.so
+lib/kst2/plugins/libkst2_filters_movingaverage.so
+lib/kst2/plugins/libkst2_filters_movingmedian.so
 lib/kst2/plugins/libkst2_filters_unwind.so
 lib/kst2/plugins/libkst2_filters_window.so
 lib/kst2/plugins/libkst2_fits_exponential_unweighted.so