graphics/paraview: Updated for version 5.5.0

Signed-off-by: Christoph Willing <chris.willing@linux.com>

5 files changed, 69 insertions, 77 deletions

diff --git a/graphics/paraview/010_doc_path.diff b/graphics/paraview/010_doc_path.diff
deleted file mode 100644
index fafcfce118..0000000000
--- a/graphics/paraview/010_doc_path.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- Qt/ApplicationComponents/pqParaViewMenuBuilders.cxx.orig	2016-11-15 01:41:57.000000000 +1000
-+++ Qt/ApplicationComponents/pqParaViewMenuBuilders.cxx	2016-11-16 11:34:49.709313333 +1000
-@@ -322,9 +322,9 @@
-   QString appdir = QCoreApplication::applicationDirPath();
-   QString documentationPath = QFileInfo(appdir).fileName() == "bin"
-     ?
--    /* w/o shared forwarding */ appdir + "/../share/paraview-" PARAVIEW_VERSION "/doc"
-+    /* w/o shared forwarding */ appdir + "/../doc/paraview-" PARAVIEW_VERSION_FULL
-     :
--    /* w/ shared forwarding  */ appdir + "/../../share/paraview-" PARAVIEW_VERSION "/doc";
-+    /* w/ shared forwarding  */ appdir + "/../../doc/paraview-" PARAVIEW_VERSION_FULL ;
- #endif
- 
-   QString paraViewGuideFile = documentationPath + "/Guide.pdf";
---- Qt/ApplicationComponents/pqWelcomeDialog.cxx.orig	2016-11-15 01:41:57.000000000 +1000
-+++ Qt/ApplicationComponents/pqWelcomeDialog.cxx	2016-11-16 11:37:26.936328667 +1000
-@@ -45,9 +45,9 @@
-   QString appdir = QCoreApplication::applicationDirPath();
-   QString documentationPath = QFileInfo(appdir).fileName() == "bin"
-     ?
--    /* w/o shared forwarding */ appdir + "/../share/paraview-" PARAVIEW_VERSION "/doc"
-+    /* w/o shared forwarding */ appdir + "/../doc/paraview-" PARAVIEW_VERSION_FULL
-     :
--    /* w/ shared forwarding  */ appdir + "/../../share/paraview-" PARAVIEW_VERSION "/doc";
-+    /* w/ shared forwarding  */ appdir + "/../../doc/paraview-" PARAVIEW_VERSION_FULL ;
- #endif
-   QString paraViewGettingStartedFile = documentationPath + "/GettingStarted.pdf";
-   QUrl gettingStartedURL = QUrl::fromLocalFile(paraViewGettingStartedFile);
diff --git a/graphics/paraview/011_doc_path.diff b/graphics/paraview/011_doc_path.diff
new file mode 100644
index 0000000000..44250005f5
--- /dev/null
+++ b/graphics/paraview/011_doc_path.diff
@@ -0,0 +1,55 @@
+--- ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.cxx.orig	2018-04-07 06:03:33.000000000 +1000
++++ ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.cxx	2018-04-09 22:02:03.621998659 +1000
+@@ -1238,7 +1238,8 @@
+ //-----------------------------------------------------------------------------
+ std::string vtkPVFileInformation::GetParaViewDocDirectory()
+ {
+-  return vtkPVFileInformation::GetParaViewSharedResourcesDirectory() + "/doc";
++  /* return vtkPVFileInformation::GetParaViewSharedResourcesDirectory() + "/doc"; */
++  return "/usr/doc/paraview-" PARAVIEW_VERSION_FULL ;
+ }
+ 
+ //-----------------------------------------------------------------------------
+--- Qt/ApplicationComponents/pqParaViewMenuBuilders.cxx.orig	2018-04-07 06:03:33.000000000 +1000
++++ Qt/ApplicationComponents/pqParaViewMenuBuilders.cxx	2018-04-10 10:03:16.737203216 +1000
+@@ -464,6 +464,7 @@
+     (menu.addAction(QIcon(":/pqWidgets/Icons/pdf.png"), "Getting Started with ParaView")
+                                   << pqSetName("actionGettingStarted")));
+ 
++/* Original
+   // ParaView Guide
+   QAction* guide = menu.addAction(QIcon(":/pqWidgets/Icons/pdf.png"), "ParaView Guide");
+   guide->setObjectName("actionGuide");
+@@ -472,6 +473,12 @@
+                                      "download.php?submit=Download&version=v5.5&type=binary&os="
+                                      "Sources&downloadFile=ParaViewGuide-5.5.0.pdf"),
+     guide);
++*/
++/* Now use local Guide */
++  QString paraViewGuideFile = documentationPath + "/Guide.pdf";
++  new pqDesktopServicesReaction(QUrl::fromLocalFile(paraViewGuideFile),
++    (menu.addAction(QIcon(":/pqWidgets/Icons/pdf.png"), "ParaView Guide")
++                                  << pqSetName("actionGuide")));
+ 
+ #ifdef PARAVIEW_USE_QTHELP
+   // Help
+@@ -482,12 +489,19 @@
+   // -----------------
+   menu.addSeparator();
+ 
++/* Originally
+   // ParaView Tutorial notes
+   new pqDesktopServicesReaction(QUrl("https://www.paraview.org/paraview-downloads/"
+                                      "download.php?submit=Download&version=v5.5&type=binary&os="
+                                      "Sources&downloadFile=ParaViewTutorial.pdf"),
+     (menu.addAction(QIcon(":/pqWidgets/Icons/pdf.png"), "ParaView Tutorial")
+                                   << pqSetName("actionTutorialNotes")));
++*/
++/* Now use local Tutorial */
++  QString paraTutorialFile = documentationPath + "/Tutorial.pdf";
++  new pqDesktopServicesReaction(QUrl::fromLocalFile(paraTutorialFile),
++    (menu.addAction(QIcon(":/pqWidgets/Icons/pdf.png"), "ParaView Tutorial")
++                                  << pqSetName("actionTutorial")));
+ 
+   // Sandia National Labs Tutorials
+   new pqDesktopServicesReaction(QUrl("http://www.paraview.org/Wiki/SNL_ParaView_4_Tutorials"),
diff --git a/graphics/paraview/1201.diff b/graphics/paraview/1201.diff
deleted file mode 100644
index 04b5345de6..0000000000
--- a/graphics/paraview/1201.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-# Upstream patch to fix building of PythonQt plugin.
-# From http://gitlab.kitware.com/paraview/paraview/merge_requests/1201/diffs
-#
-diff --git a/Plugins/PythonQtPlugin/CMakeLists.txt b/Plugins/PythonQtPlugin/CMakeLists.txt
-index d87853b..d249961 100644
---- a/Plugins/PythonQtPlugin/CMakeLists.txt
-+++ b/Plugins/PythonQtPlugin/CMakeLists.txt
-@@ -7,6 +7,8 @@ else()
-   include(${PARAVIEW_USE_FILE})
- endif()
- 
-+include(ParaViewQt)
-+pv_find_package_qt(qt_targets REQUIRED QT4_COMPONENTS QtGui QT5_COMPONENTS Widgets)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
- find_package(PythonQt REQUIRED)
-@@ -23,17 +25,7 @@ set(PythonQtPlugin_MOC_SRCS
-   pqPythonEventFilter.h
-   )
- 
--if (PARAVIEW_QT_VERSION VERSION_GREATER "4")
--  qt5_wrap_cpp(MOC_SRCS
--    ${PythonQtPlugin_MOC_SRCS}
--    ${decorator_file}
--    )
--else ()
--  qt4_wrap_cpp(MOC_SRCS
--    ${PythonQtPlugin_MOC_SRCS}
--    ${decorator_file}
--    )
--endif ()
-+pv_qt_wrap_cpp(MOC_SRCS ${PythonQtPlugin_MOC_SRCS} ${decorator_file})
- 
- set(srcs
-   pqPythonQtPlugin.cxx
diff --git a/graphics/paraview/paraview.SlackBuild b/graphics/paraview/paraview.SlackBuild
index a3ab0915b7..860477223c 100644
--- a/graphics/paraview/paraview.SlackBuild
+++ b/graphics/paraview/paraview.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for paraview
 
-# Copyright 2016-2017 Christoph Willing  Brisbane, Australia
+# Copyright 2016-2018 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,9 @@
 
 PRGNAM=paraview
 SRCNAM=ParaView
-VERSION=${VERSION:-5.4.1}
-SHORT_VERSION=${SHORT_VERSION:-5.4}
-DOC_VERSION=${DOC_VERSION:-5.4.0}
+VERSION=${VERSION:-5.5.0}
+SHORT_VERSION=${SHORT_VERSION:-5.5}
+DOC_VERSION=${DOC_VERSION:-5.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,7 @@ cd $TMP
 rm -rf $SRCNAM-v$VERSION
 tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz
 cd $SRCNAM-v$VERSION
-patch -p0 < $CWD/010_doc_path.diff
+patch -p0 < $CWD/011_doc_path.diff
 patch -p0 < $CWD/020_vtkdocs.diff
 sed -i -e 's/@PARAVIEW_VERSION_FULL@/1.0/'  Applications/ParaView/paraview.desktop.in
 echo "Exec=paraview" >> Applications/ParaView/paraview.desktop.in
diff --git a/graphics/paraview/paraview.info b/graphics/paraview/paraview.info
index a2aaee79fa..5777d3f5ca 100644
--- a/graphics/paraview/paraview.info
+++ b/graphics/paraview/paraview.info
@@ -1,16 +1,16 @@
 PRGNAM="paraview"
-VERSION="5.4.1"
+VERSION="5.5.0"
 HOMEPAGE="https://www.paraview.org"
-DOWNLOAD="https://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz \
-	https://www.paraview.org/files/v5.4/ParaViewTutorial.pdf \
+DOWNLOAD="https://www.paraview.org/files/v5.5/ParaView-v5.5.0.tar.gz \
+	https://www.paraview.org/files/v5.5/ParaViewTutorial.pdf \
 	https://www.paraview.org/Wiki/images/5/5d/ParaViewTutorialData.tar.gz \
-	https://www.paraview.org/files/v5.4/ParaViewGuide-5.4.0.pdf \
-	https://www.paraview.org/files/v5.4/ParaViewGettingStarted-5.4.0.pdf"
-MD5SUM="4030c70477ec5a85aa72d6fc86a30753 \
-	1b3d975eac73bca412414efb2af9974c \
+	https://www.paraview.org/files/v5.5/ParaViewGuide-5.5.0.pdf \
+	https://www.paraview.org/files/v5.5/ParaViewGettingStarted-5.5.0.pdf"
+MD5SUM="a8f2f41edadffdcc89b37fdc9aa7f005 \
+	34af0c7af6609a1790b9078cbd7e29eb \
 	0a4c2a37b8e566ccdb3b1eaaa949477a \
-	f15e485941d26d4d804c5f8fa539465d \
-	1161cc4b4c2e6476449f6433bcc10120"
+	5f515d76702cc2dc98631da040b14187 \
+	1bdadd4b5a62ba9f2de8eb0219ca858c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5 ffmpeg hdf5 Sphinx matplotlib mpich"