5.4.0

2 files changed, 36 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45a250b48290..291becfe693e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Mar 23 19:12:42 UTC 2017
+# Wed Jun 14 17:18:54 UTC 2017
 pkgbase = mingw-w64-paraview
 	pkgdesc = Parallel Visualization Application using VTK (mingw-w64)
-	pkgver = 5.3.0
+	pkgver = 5.4.0
 	pkgrel = 1
 	url = http://www.paraview.org
 	arch = any
@@ -24,11 +24,13 @@ pkgbase = mingw-w64-paraview
 	depends = mingw-w64-pugixml
 	depends = mingw-w64-hdf5
 	depends = mingw-w64-lz4
+	depends = mingw-w64-cgns
+	depends = mingw-w64-netcdf-cxx-legacy
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://paraview.org/files/v5.3/ParaView-v5.3.0.tar.gz
-	sha1sums = c8a31039b189e63b20618bbfa91e89555ce62b6d
+	source = http://paraview.org/files/v5.4/ParaView-v5.4.0.tar.gz
+	sha1sums = d1bc9112d76f603d3232069b4ea9c507c4e1b1a7
 
 pkgname = mingw-w64-paraview
 
diff --git a/PKGBUILD b/PKGBUILD
index 7e6ae791bb07..7e210d9b9712 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 pkgname=mingw-w64-paraview
-_majordotminor=5.3
+_majordotminor=5.4
 pkgver=${_majordotminor}.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-expat'  'mingw-w64-freetype2'  'mingw-w64-libjpeg'  'mingw-w64-libxml2' 'mingw-w64-libtheora' 'mingw-w64-libpng' 'mingw-w64-libtiff' 'mingw-w64-zlib' 'mingw-w64-jsoncpp' 'mingw-w64-pugixml' 'mingw-w64-hdf5' 'mingw-w64-lz4')
+depends=('mingw-w64-qt5-xmlpatterns' 'mingw-w64-qt5-tools' 'mingw-w64-boost' 'mingw-w64-glew' 'mingw-w64-expat'  'mingw-w64-freetype2'  'mingw-w64-libjpeg'  'mingw-w64-libxml2' 'mingw-w64-libtheora' 'mingw-w64-libpng' 'mingw-w64-libtiff' 'mingw-w64-zlib' 'mingw-w64-jsoncpp' 'mingw-w64-pugixml' 'mingw-w64-hdf5' 'mingw-w64-lz4' 'mingw-w64-cgns' 'mingw-w64-netcdf-cxx-legacy')
 makedepends=('mingw-w64-cmake')
 options=('!buildflags' '!strip' 'staticlibs')
 source=("http://paraview.org/files/v${_majordotminor}/ParaView-v${pkgver}.tar.gz")
-sha1sums=('c8a31039b189e63b20618bbfa91e89555ce62b6d')
+sha1sums=('d1bc9112d76f603d3232069b4ea9c507c4e1b1a7')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -20,45 +20,54 @@ prepare() {
   # disable all plugins ~ -DPARAVIEW_BUILD_PLUGIN_XXX=OFF
   sed -i "s|if (PARAVIEW_BUILD_PLUGIN|if(OFF|g" CMake/ParaViewPluginsMacros.cmake
 
-  # https://gitlab.kitware.com/paraview/paraview/merge_requests/1434
-  sed -i "s|#include <Windows.h>|#include <windows.h>|g" ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx
-  sed -i "s|#include <Windows.h>|#include <windows.h>|g" Qt/Core/pqObjectBuilder.cxx
+  # https://gitlab.kitware.com/paraview/paraview/merge_requests/1716
+  sed -i "s|if (CMAKE_CROSSCOMPILING AND NOT COMPILE_TOOLS_IMPORTED)|if (CMAKE_CROSSCOMPILING AND NOT COMPILE_TOOLS_IMPORTED AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR AND CMAKE_VERSION VERSION_LESS 3.8)|g" CMakeLists.txt
+  sed -i "s|if (NOT CMAKE_CROSSCOMPILING)|if (NOT COMPILE_TOOLS_IMPORTED)|g" Utilities/WrapClientServer/CMakeLists.txt Utilities/ProcessXML/CMakeLists.txt 
+  sed -i "s|IF(NOT CMAKE_CROSSCOMPILING)|if (NOT COMPILE_TOOLS_IMPORTED)|g" ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt
+  
+  # https://gitlab.kitware.com/vtk/vtk/merge_requests/2931
+  sed -i "s|NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR|NOT VTK_COMPILE_TOOLS_IMPORTED|g" VTK/Utilities/EncodeString/CMakeLists.txt  
 
-  # https://gitlab.kitware.com/paraview/paraview/merge_requests/1436
-  sed -i "313iif(MINGW)\ntarget_link_libraries (\${BPC_NAME} LINK_PRIVATE msvcr90)\nendif()" CMake/ParaViewBranding.cmake
+  # https://gitlab.kitware.com/paraview/protobuf/merge_requests/4
+  sed -i "s|string Subprocess::Win32ErrorMessage|string Win32ErrorMessage|g" ThirdParty/protobuf/vtkprotobuf/src/google/protobuf/compiler/subprocess.h
+
+  # vtkParse.tab.c reads an extra (empty) new line
+  sed -i "12210i    if((n == 0) && (lineno > 0)) continue;" VTK/Wrapping/Tools/vtkParse.tab.c
+
+  # fix libharu export
+  sed -i "s|WIN32 AND NOT CYGWIN|MSVC|g" VTK/ThirdParty/libharu/vtklibharu/src/CMakeLists.txt 
 }
 
 build() {
   cd "${srcdir}/ParaView-v${pkgver}"
-  # native build
-  mkdir -p build-native && pushd build-native
-  cmake ..
-  make vtkEncodeString vtkHashSource vtkWrapClientServer protoc_compiler kwProcessXML
-  popd
+  mkdir -p build-native
+  if ! test -d "build-native"
+  then
+    # native build
+    mkdir -p build-native && pushd build-native
+    cmake ..
+    make vtkEncodeString vtkHashSource vtkWrapClientServer protoc_compiler kwProcessXML
+    popd
+  fi
 
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
     -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-    -DCOMPILE_TOOLS_IMPORTED=OFF \
-    -DParaViewCompileTools_DIR=$PWD/../build-native \
-    -DBUILD_TESTING:BOOL=OFF \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
+    -DPARAVIEW_BUILD_QT_GUI:BOOL=OFF \
     -DOSPRAY_INSTALL_DIR:PATH=/usr \
-    -DPARAVIEW_ENABLE_CGNS:BOOL=OFF \
     -DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF \
     -DPARAVIEW_ENABLE_PYTHON:BOOL=OFF \
     -DPARAVIEW_PYTHON_VERSION=2 \
     -DPARAVIEW_QT_VERSION=5 \
-    -DPARAVIEW_USE_MPI:BOOL=OFF \
     -DPARAVIEW_USE_VISITBRIDGE:BOOL=OFF \
     -DPARAVIEW_USE_OSPRAY:BOOL=OFF \
     -DVTK_USE_SYSTEM_LIBRARIES=ON \
     -DVTK_USE_SYSTEM_QTTESTING=OFF \
-    -DVTK_USE_SYSTEM_NETCDF=OFF \
     -DVTK_USE_SYSTEM_XDMF2=OFF \
     -DVTK_USE_SYSTEM_PROTOBUF:BOOL=OFF \
     -DVTK_USE_SYSTEM_GL2PS=OFF \
+    -DVTK_USE_SYSTEM_LIBHARU=OFF \
     -DVISIT_BUILD_READER_CGNS:BOOL=OFF \
     -DVTK_PYTHON_VERSION=2 \
     -DVTK_QT_VERSION=5 \
@@ -66,17 +75,8 @@ build() {
     -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=OpenMP \
     -DPARAVIEW_BUILD_PLUGIN_AcceleratedAlgorithms=OFF \
     -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO=OFF \
+    -DHDF5_ROOT=/usr/${_arch}/ \
     ..
-
-    # fix some generation rules
-    find . -name build.make | xargs sed -i "s|bin/rcc Qt5::rcc|bin/rcc|g"
-    find . -name build.make | xargs sed -i "s|bin/moc Qt5::moc|bin/moc|g"
-    find . -name build.make | xargs sed -i "s|bin/vtkEncodeString-pv${_majordotminor} vtkEncodeString|bin/vtkEncodeString-pv${_majordotminor}|g"
-    find . -name build.make | xargs sed -i "s|bin/vtkHashSource-pv${_majordotminor} vtkHashSource|bin/vtkHashSource-pv${_majordotminor}|g"
-    find . -name build.make | xargs sed -i "s|bin/protoc protoc_compiler|bin/protoc|g"
-    find . -name build.make | xargs sed -i "s|bin/vtkkwProcessXML-pv${_majordotminor} kwProcessXML|bin/vtkkwProcessXML-pv${_majordotminor}|g"
-    find . -name build.make | xargs sed -i "s|bin/vtkWrapClientServer-pv${_majordotminor} vtkWrapClientServer|bin/vtkWrapClientServer-pv${_majordotminor}|g"
-
     make
     popd
   done