5.8.0

2 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61b5031eeda0..7360e29fbe60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-paraview
 	pkgdesc = Parallel Visualization Application using VTK (mingw-w64)
-	pkgver = 5.7.1
+	pkgver = 5.8.0
 	pkgrel = 1
 	url = http://www.paraview.org
 	arch = any
@@ -13,6 +13,7 @@ pkgbase = mingw-w64-paraview
 	makedepends = protobuf
 	depends = mingw-w64-qt5-xmlpatterns
 	depends = mingw-w64-qt5-tools
+	depends = mingw-w64-qt5-svg
 	depends = mingw-w64-boost
 	depends = mingw-w64-glew
 	depends = mingw-w64-freetype2
@@ -26,11 +27,13 @@ pkgbase = mingw-w64-paraview
 	depends = mingw-w64-netcdf
 	depends = mingw-w64-double-conversion
 	depends = mingw-w64-protobuf
+	depends = mingw-w64-libtheora
+	depends = mingw-w64-pugixml
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://paraview.org/files/v5.7/ParaView-v5.7.1.tar.gz
-	sha256sums = b6102dcd0099a3a23fe1bbf2d562e21d981e068b252381ad5db4392bfd871e47
+	source = http://paraview.org/files/v5.8/ParaView-v5.8.0.tar.gz
+	sha256sums = a6f3bbab3b4cb98beaeae5699e62562330210cddeadcfaa7cce8f9d25bac5e85
 
 pkgname = mingw-w64-paraview
 
diff --git a/PKGBUILD b/PKGBUILD
index f22c02c3c445..6067601165c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,37 @@
 pkgname=mingw-w64-paraview
-_majordotminor=5.7
-pkgver=${_majordotminor}.1
-_pkgver=${pkgver}
+pkgver=5.8.0
 pkgrel=1
 pkgdesc='Parallel Visualization Application using VTK (mingw-w64)'
 arch=('any')
 url='http://www.paraview.org'
 license=('custom')
-depends=('mingw-w64-qt5-xmlpatterns' 'mingw-w64-qt5-tools' 'mingw-w64-boost' 'mingw-w64-glew' 'mingw-w64-freetype2' 'mingw-w64-libxml2' 'mingw-w64-libtiff' 'mingw-w64-jsoncpp' 'mingw-w64-hdf5' 'mingw-w64-lz4' 'mingw-w64-proj' 'mingw-w64-cgns' 'mingw-w64-netcdf' 'mingw-w64-double-conversion' 'mingw-w64-protobuf')
+depends=('mingw-w64-qt5-xmlpatterns' 'mingw-w64-qt5-tools' 'mingw-w64-qt5-svg' 'mingw-w64-boost' 'mingw-w64-glew' 'mingw-w64-freetype2' 'mingw-w64-libxml2' 'mingw-w64-libtiff' 'mingw-w64-jsoncpp' 'mingw-w64-hdf5' 'mingw-w64-lz4' 'mingw-w64-proj' 'mingw-w64-cgns' 'mingw-w64-netcdf' 'mingw-w64-double-conversion' 'mingw-w64-protobuf' 'mingw-w64-libtheora' 'mingw-w64-pugixml')
 makedepends=('mingw-w64-cmake' 'mingw-w64-eigen' 'mingw-w64-utf8cpp' 'mingw-w64-wine' 'mingw-w64-wine-qt' 'protobuf')
 options=('!buildflags' '!strip' 'staticlibs')
-source=("http://paraview.org/files/v${_majordotminor}/ParaView-v${_pkgver}.tar.gz")
-sha256sums=('b6102dcd0099a3a23fe1bbf2d562e21d981e068b252381ad5db4392bfd871e47')
+source=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.gz")
+sha256sums=('a6f3bbab3b4cb98beaeae5699e62562330210cddeadcfaa7cce8f9d25bac5e85')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd "${srcdir}/ParaView-v${_pkgver}"
-  curl -L https://gitlab.kitware.com/paraview/paraview/merge_requests/3677.patch | patch -p1
+  cd "${srcdir}/ParaView-v${pkgver}"
   cd VTK
-  curl -L https://gitlab.kitware.com/vtk/vtk/merge_requests/5734.patch | patch -p1
-  curl -L https://gitlab.kitware.com/vtk/vtk/merge_requests/5925.patch | patch -p1
+  curl -L https://gitlab.kitware.com/vtk/vtk/merge_requests/6296.patch | patch -p1
+  curl -L https://gitlab.kitware.com/vtk/vtk/merge_requests/6406.patch | patch -p1
+  curl -L https://gitlab.kitware.com/vtk/vtk/merge_requests/6455.patch | patch -p1
 }
 
 build() {
-  cd "${srcdir}/ParaView-v${_pkgver}"
+  cd "${srcdir}/ParaView-v${pkgver}"
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
+      -DCMAKE_BUILD_TYPE=Release \
       -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \
-      -DPARAVIEW_ENABLE_PYTHON=OFF \
+      -DPARAVIEW_USE_PYTHON=OFF \
       -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF \
       -DPARAVIEW_USE_VTKM=OFF \
-      -DPARAVIEW_USE_EXTERNAL=ON \
+      -DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
       -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=OFF \
       -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF \
       -Dqt_xmlpatterns_executable=/usr/bin/${_arch}-xmlpatterns \
@@ -44,7 +43,7 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
-    cd "$srcdir"/ParaView-v${_pkgver}/build-${_arch}
+    cd "$srcdir"/ParaView-v${pkgver}/build-${_arch}
     make install/fast DESTDIR="$pkgdir"
     rm -r "$pkgdir"/usr/${_arch}/share
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll