graphics/paraview: Updated for version 5.6.0

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

3 files changed, 12 insertions, 66 deletions

diff --git a/graphics/paraview/011_doc_path.diff b/graphics/paraview/011_doc_path.diff
index 44250005f54f..3b49cc11ec16 100644
--- a/graphics/paraview/011_doc_path.diff
+++ b/graphics/paraview/011_doc_path.diff
@@ -1,6 +1,6 @@
---- 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 @@
+--- ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.cxx.orig	2018-11-07 05:03:24.000000000 +1000
++++ ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.cxx	2018-11-23 18:17:38.214000000 +1000
+@@ -1227,7 +1227,8 @@
  //-----------------------------------------------------------------------------
  std::string vtkPVFileInformation::GetParaViewDocDirectory()
  {
@@ -10,46 +10,3 @@
  }
  
  //-----------------------------------------------------------------------------
---- 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/paraview.SlackBuild b/graphics/paraview/paraview.SlackBuild
index 138eab0e0084..006f9ca3cc0e 100644
--- a/graphics/paraview/paraview.SlackBuild
+++ b/graphics/paraview/paraview.SlackBuild
@@ -24,9 +24,9 @@
 
 PRGNAM=paraview
 SRCNAM=ParaView
-VERSION=${VERSION:-5.5.2}
-SHORT_VERSION=${SHORT_VERSION:-5.5}
-DOC_VERSION=${DOC_VERSION:-5.5.2}
+VERSION=${VERSION:-5.6.0}
+SHORT_VERSION=${SHORT_VERSION:-5.6}
+DOC_VERSION=${DOC_VERSION:-5.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-v$VERSION
-tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-v$VERSION.tar.xz
 cd $SRCNAM-v$VERSION
 patch -p0 < $CWD/011_doc_path.diff
 patch -p0 < $CWD/020_vtkdocs.diff
@@ -113,7 +113,6 @@ cd build
     -DICET_INSTALL_MAN_DIR=man \
     -DVTK_INSTALL_ARCHIVE_DIR=lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION} \
     -DVTK_INSTALL_LIBRARY_DIR=lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION} \
-    -DVTK_INSTALL_PYTHON_MODULE_DIR=lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION}/site-packages \
     -DVTK_INSTALL_PACKAGE_DIR=lib${LIBDIRSUFFIX}/cmake/${PRGNAM}-${VERSION} \
     -DVTK_INSTALL_DOC_DIR=doc/${PRGNAM}-${VERSION} \
     -DQtTesting_INSTALL_LIB_DIR=lib${LIBDIRSUFFIX} \
@@ -141,16 +140,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/share/$PRGNAM-$SHORT_VERSION/data
-tar xf $CWD/ParaViewTutorialData.tar.gz
-chown root:root ParaViewTutorialData/*
-cp -p  ParaViewTutorialData/* $PKG/usr/share/$PRGNAM-$SHORT_VERSION/data
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   CONTRIBUTING.* Copyright.* License_v1.2.txt README.* version.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/ParaViewTutorial.pdf $PKG/usr/doc/$PRGNAM-$VERSION/Tutorial.pdf
 cp $CWD/ParaViewGettingStarted-${DOC_VERSION}.pdf $PKG/usr/doc/$PRGNAM-$VERSION/GettingStarted.pdf
 cp $CWD/ParaViewGuide-${DOC_VERSION}.pdf $PKG/usr/doc/$PRGNAM-$VERSION/Guide.pdf
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/paraview/paraview.info b/graphics/paraview/paraview.info
index 4243523988a1..d890f2dca373 100644
--- a/graphics/paraview/paraview.info
+++ b/graphics/paraview/paraview.info
@@ -1,14 +1,10 @@
 PRGNAM="paraview"
-VERSION="5.5.2"
+VERSION="5.6.0"
 HOMEPAGE="https://www.paraview.org"
-DOWNLOAD="https://www.paraview.org/files/v5.5/ParaView-v5.5.2.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.5/ParaViewGuide-5.5.2.pdf \
-	https://www.paraview.org/files/v5.5/ParaViewGettingStarted-5.5.2.pdf"
-MD5SUM="7eb93c31a1e5deb7098c3b4275e53a4a \
-	34af0c7af6609a1790b9078cbd7e29eb \
-	0a4c2a37b8e566ccdb3b1eaaa949477a \
+DOWNLOAD="https://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.xz \
+	https://www.paraview.org/files/v5.6/ParaViewGuide-5.6.0.pdf \
+	https://www.paraview.org/files/v5.6/ParaViewGettingStarted-5.6.0.pdf"
+MD5SUM="eefb05c36ba2c3a6b25991b73f699981 \
 	4013363d00c1f51e192bdf2778bea00b \
 	1bdadd4b5a62ba9f2de8eb0219ca858c"
 DOWNLOAD_x86_64=""