[arch-commits] Commit in paraview/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Thursday, July 26, 2018 @ 06:02:39
  Author: eschwartz
Revision: 363457

upgpkg: paraview 5.5.2-2

python 3.7 rebuild
protobuf 3.6.0 rebuild

Modified:
  paraview/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-26 05:40:43 UTC (rev 363456)
+++ PKGBUILD	2018-07-26 06:02:39 UTC (rev 363457)
@@ -14,11 +14,11 @@
 pkgname=${_pkg}
 #-${_mpi}
 pkgver=5.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
 arch=('x86_64')
 url="https://www.paraview.org"
-license=('custom')
+license=('BSD' 'custom')
 depends=('qt5-tools' 'qt5-x11extras' 'ospray' 'ffmpeg' 'openmpi'
          'cgns' 'python-pygments' 'protobuf' 'pugixml'
          'python-matplotlib' 'python-numpy' 'python-mpi4py'
@@ -30,14 +30,23 @@
 #        proj apparently not used in this VTK configuration
 makedepends=('cmake' 'boost' 'mesa' 'gcc-fortran' 'ninja' 'qt5-tools' 'qt5-xmlpatterns')
 source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.xz"
-        'fix-qt5.11-headers.patch')
+        'fix-qt5.11-headers.patch'
+        'https://gitlab.kitware.com/vtk/vtk/commit/706f1b397df09a27ab8981ab9464547028d0c322.patch'
+        '0001-fix-build-on-python-3.7.patch')
 sha256sums=('4b9d186bac59e412ae09cae49c3ec3ec59803c25f63e89f92efe07b05dc1b896'
-            '638e3148d855e1de2ca7711f9dd1eb6ec5410e3c412d949abf2a34ef2086f0c7')
+            '638e3148d855e1de2ca7711f9dd1eb6ec5410e3c412d949abf2a34ef2086f0c7'
+            '37690540cc0cf6b52fb980b39f9f7bc603d1670fac9e2939ff05ddc349407448'
+            '508717c9cf128772fb99f16354c5a645c6e0d432dd5cfda64d4898860e0c09df')
 
 prepare() {
     mkdir -p build
     cd ParaView-v${pkgver}/
     patch -p1 -i ../fix-qt5.11-headers.patch
+    # https://gitlab.kitware.com/paraview/paraview/issues/18323
+    patch -p1 -i ../0001-fix-build-on-python-3.7.patch
+    cd VTK
+    # https://gitlab.kitware.com/vtk/vtk/issues/17350
+    patch -p1 -i "${srcdir}"/706f1b397df09a27ab8981ab9464547028d0c322.patch
 }
 
 build() {
@@ -55,7 +64,7 @@
         VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
     done
     # Specific system libs for ParaView version
-    for lib in CGNS PUGIXML PROTOBUF PYGMENTS 
+    for lib in CGNS PUGIXML PROTOBUF PYGMENTS
     do
         VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
     done