science/scidavis: Update to 2.9.2

7 files changed, 49 insertions, 16 deletions

diff --git a/science/scidavis/Makefile b/science/scidavis/Makefile
index e35eae6cb63e..3f42d78e468c 100644
--- a/science/scidavis/Makefile
+++ b/science/scidavis/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	scidavis
-PORTVERSION=	2.7
-PORTREVISION=	1
+PORTVERSION=	2.9.2
 CATEGORIES=	science
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/science/scidavis/distinfo b/science/scidavis/distinfo
index 1d604ea404ad..6a7549054d8a 100644
--- a/science/scidavis/distinfo
+++ b/science/scidavis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644054781
-SHA256 (highperformancecoder-scidavis-2.7_GH0.tar.gz) = 9ecf8f2a68b2f230e39446576a37b12f86055ce09efcfa77df9d7e4039c66800
-SIZE (highperformancecoder-scidavis-2.7_GH0.tar.gz) = 9123402
+TIMESTAMP = 1650794322
+SHA256 (highperformancecoder-scidavis-2.9.2_GH0.tar.gz) = 2b4eb49a442e2f8cb676d7d01ec485008310f0a1ca24f5352f0c1fc78480c8f4
+SIZE (highperformancecoder-scidavis-2.9.2_GH0.tar.gz) = 9348640
diff --git a/science/scidavis/files/patch-3rdparty_CMakeLists.txt b/science/scidavis/files/patch-3rdparty_CMakeLists.txt
new file mode 100644
index 000000000000..6bdc5f6ba16d
--- /dev/null
+++ b/science/scidavis/files/patch-3rdparty_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- 3rdparty/CMakeLists.txt.orig	2022-04-16 07:39:19 UTC
++++ 3rdparty/CMakeLists.txt
+@@ -47,7 +47,7 @@ option( BUILD_QWTPLOT3D "Build QwtPlot3D using own cod
+ 
+ if( NOT BUILD_QWTPLOT3D )
+ find_library ( QWTPLOT3D_LIBRARY
+-    NAMES qwtplot3d
++    NAMES qwtplot3d qwtplot3d-qt5
+     HINTS ${QT_LIBRARY_DIR}
+   )
+   if( NOT QWTPLOT3D_LIBRARY )
diff --git a/science/scidavis/files/patch-CMakeLists.txt b/science/scidavis/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..8f1c1c3d7326
--- /dev/null
+++ b/science/scidavis/files/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+--- CMakeLists.txt.orig	2022-04-16 07:39:19 UTC
++++ CMakeLists.txt
+@@ -1,5 +1,4 @@
+ cmake_minimum_required( VERSION 3.16 )
+-include(GNUInstallDirs)
+ 
+ # Target platform is Windows 10
+ if( CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017" OR
+@@ -14,6 +13,7 @@ project( scidavis
+   DESCRIPTION "SciDAVis is a free application for Scientific Data Analysis and Visualization."
+   HOMEPAGE_URL "https://scidavis.sourceforge.net"
+   LANGUAGES CXX C)
++include(GNUInstallDirs)
+ 
+ set( CMAKE_CXX_STANDARD 17)
+ set( CMAKE_CXX_STANDARD_REQUIRED TRUE )
diff --git a/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp b/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp
index 1f5e4682f973..b98124edb0f3 100644
--- a/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp
+++ b/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp
@@ -1,6 +1,6 @@
---- libscidavis/src/ApplicationWindow.cpp.orig	2021-05-05 01:51:49 UTC
+--- libscidavis/src/ApplicationWindow.cpp.orig	2022-04-16 07:39:19 UTC
 +++ libscidavis/src/ApplicationWindow.cpp
-@@ -4200,7 +4200,7 @@ void ApplicationWindow::readSettings()
+@@ -4201,7 +4201,7 @@ void ApplicationWindow::readSettings()
      settings.endGroup(); // Colors
  
      settings.beginGroup("/Paths");
@@ -9,7 +9,7 @@
      helpFilePath = settings.value("/HelpFile", "").toString();
  #ifdef PLUGIN_PATH
      QString defaultFitPluginsPath = PLUGIN_PATH;
-@@ -8062,6 +8062,10 @@ void ApplicationWindow::showWindowTitleBarMenu()
+@@ -8063,6 +8063,10 @@ void ApplicationWindow::showWindowTitleBarMenu()
  void ApplicationWindow::chooseHelpFolder()
  {
  // TODO: move all paths & location handling to anothor class
@@ -20,7 +20,7 @@
  #if defined(Q_OS_WIN)
      const QString locateDefaultHelp =
              qApp->applicationDirPath() + QDir::toNativeSeparators("/manual/index.html");
-@@ -8069,6 +8073,8 @@ void ApplicationWindow::chooseHelpFolder()
+@@ -8070,6 +8074,8 @@ void ApplicationWindow::chooseHelpFolder()
      const QString locateDefaultHelp =
              QDir::toNativeSeparators("/usr/share/doc/scidavis/manual/index.html");
  #endif
diff --git a/science/scidavis/files/patch-scidavis_CMakeLists.txt b/science/scidavis/files/patch-scidavis_CMakeLists.txt
index b3dc6db30676..56e9e3a5e3fd 100644
--- a/science/scidavis/files/patch-scidavis_CMakeLists.txt
+++ b/science/scidavis/files/patch-scidavis_CMakeLists.txt
@@ -1,11 +1,19 @@
---- scidavis/CMakeLists.txt.orig	2021-05-05 01:51:49 UTC
+--- scidavis/CMakeLists.txt.orig	2022-04-16 07:39:19 UTC
 +++ scidavis/CMakeLists.txt
-@@ -135,7 +135,7 @@ if (NOT CMAKE_CROSS_COMPILING)
+@@ -36,7 +36,6 @@ add_executable( scidavis
+ message(${QM_FILES})
+ 
+ # SciDAVis expects qm files to be in the translations directory. qt5_create_translation puts them somewhere else
+-add_custom_command(TARGET scidavis COMMAND cp ${QM_FILES} translations)
+ 
+ target_link_libraries( scidavis libscidavis )
+ 
+@@ -146,7 +145,7 @@ endif()
        if( MULTI_CONFIG )
-         install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION etc )
+         install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} )
        else()
--        install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION etc )
-+        install( FILES scidavisrc.py DESTINATION etc )
+-        install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} )
++        install( FILES scidavisrc.py DESTINATION ${PYTHON_SCRIPTDIR} )
        endif()
        install( FILES scidavisUtil.py DESTINATION share/scidavis )
      endif()
diff --git a/science/scidavis/pkg-plist b/science/scidavis/pkg-plist
index 9f1aa93ac47a..fc3eae4fb4a5 100644
--- a/science/scidavis/pkg-plist
+++ b/science/scidavis/pkg-plist
@@ -5,7 +5,6 @@ lib/scidavis/plugins/libexplin.so
 lib/scidavis/plugins/libfitRational0.so
 lib/scidavis/plugins/libfitRational1.so
 lib/scidavis/plugins/libplanck_wavelength.so
-share/appdata/scidavis.appdata.xml
 share/applications/scidavis.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
@@ -22,6 +21,7 @@ share/icons/locolor/16x16/apps/scidavis.png
 share/icons/locolor/22x22/apps/scidavis.png
 share/icons/locolor/32x32/apps/scidavis.png
 share/man/man1/scidavis.1.gz
+share/metainfo/scidavis.appdata.xml
 share/mime/packages/scidavis.xml
 share/mimelnk/application/x-sciprj.desktop
 %%PYTHON%%%%DATADIR%%/scidavisUtil.py
@@ -34,6 +34,5 @@ share/mimelnk/application/x-sciprj.desktop
 %%NLS%%%%DATADIR%%/translations/scidavis_pl.qm
 %%NLS%%%%DATADIR%%/translations/scidavis_pt-br.qm
 %%NLS%%%%DATADIR%%/translations/scidavis_ru.qm
-%%NLS%%%%DATADIR%%/translations/scidavis_sv.qm
 %%NLS%%%%DATADIR%%/translations/scidavis_zh-cn.qm
 %%NLS%%%%DATADIR%%/translations/scidavis_zh-tw.qm