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

[Bruno Pagani]

    Date: Friday, August 17, 2018 @ 23:08:08
  Author: archange
Revision: 372579

upgpkg: vtk 8.1.1-1

Switch to python 3 (FS#48113).
Clean PKGBUILD a bit.

Modified:
  vtk/trunk/PKGBUILD

----------+
 PKGBUILD |   62 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-17 22:31:31 UTC (rev 372578)
+++ PKGBUILD	2018-08-17 23:08:08 UTC (rev 372579)
@@ -1,13 +1,13 @@
 # $Id$
 # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Maintainer: Bruno Pagani <archange at archlinux dot org>
 # Contributor: Ray Rashif <schiv at archlinux dot org>
 # Contributor: Andrzej Giniewicz <gginiu at gmail dot com>
 # Contributor: Thomas Dziedzic <gostrc at gmail>
 
 pkgname=vtk
-pkgver=8.1.0
-_majorver=8.1
-pkgrel=6
+pkgver=8.1.1
+pkgrel=1
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization'
 arch=('x86_64')
 url='http://www.vtk.org/'
@@ -15,21 +15,21 @@
 depends=('gcc-libs')
 makedepends=('boost' 'cmake' 'doxygen' 'ffmpeg' 'gdal' 'glew' 'gnuplot'
              'hdf5' 'java-environment' 'jsoncpp' 'lz4'
-             'mariadb' 'netcdf' 'openmpi' 'proj' 'python2-autobahn' 'python2-constantly'
-             'python2-incremental' 'python2-matplotlib'
-             'python2-mpi4py' 'python2-twisted' 'qt5-base' 'qt5-tools'
+             'mariadb' 'netcdf' 'openmpi' 'proj' 'python-autobahn' 'python-constantly'
+             'python-incremental' 'python-matplotlib'
+             'python-mpi4py' 'python-twisted' 'qt5-base' 'qt5-tools'
              'qt5-webkit' 'qt5-x11extras' 'tk' 'unixodbc' 'wget')
-optdepends=('python2: python bindings'
+optdepends=('python: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
             'gnuplot: plotting tools'
             'graphviz: drawing tools'
-            'python2-constantly'
-            'python2-incremental'
-            'python2-matplotlib: for Matplotlib rendering'
-            'python2-twisted: for vtkWeb'
-            'python2-autobahn: for vtkWeb'
-            'python2-mpi4py: OpenMPI python support'
+            'python-constantly'
+            'python-incremental'
+            'python-matplotlib: for Matplotlib rendering'
+            'python-twisted: for vtkWeb'
+            'python-autobahn: for vtkWeb'
+            'python-mpi4py: OpenMPI python support'
             'openmpi: OpenMPI support'
             'qt5-x11extras'
             'qt5-webkit: WebKit support'
@@ -43,21 +43,25 @@
             'netcdf'
             'proj'
             'unixodbc')
-source=("http://www.vtk.org/files/release/${_majorver}/VTK-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${_majorver}/VTKData-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz")
+source=("http://www.vtk.org/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz"
+        "http://www.vtk.org/files/release/${pkgver%.*}/VTKData-${pkgver}.tar.gz"
+        "http://www.vtk.org/files/release/${pkgver%.*}/VTKLargeData-${pkgver}.tar.gz"
+        "https://gitlab.kitware.com/vtk/vtk/merge_requests/4490.patch")
 options=(staticlibs)
-sha512sums=('3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3'
-            '0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047'
-            '9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31')
+sha512sums=('7ab38042f6d94d1580125b3a68a6d17cdc3de925d0e886ebfc8c414adfba1438f5783d896a4cd1bb7e15462450107ab5773a3a749195b357f062e91d5c410060'
+            '6c20cfb9dda9d64c27946693f22357f38699d2ff014c2f33e3b05573935eaf3b7a4e30a8cf5747772a6dafe39c20e90b78a0267620ff6b6d5b487edf8ef4f975'
+            '9966b8474c22c2fb23a51e0411f06bc4f33e4233535d0b4875a87731c6c95e2c10c97565dc0e6af2af6c7ed7d5e5de171eddf9678cc4235a329cdaf36a021dd4'
+            '27a14e2d80740cbf4c789d37d64d07d4f320b3b1287fb4436360a4a3d5c5f8b29ddeb05cf0dface7570959dde2a4bff483b5a474d29e3b0b0d1352a488b1ca2c')
 
 prepare() {
-  rm -rf "build"
-  mkdir "build"
+  mkdir build
+  cd VTK-${pkgver}
+  # Fix building with python 3.7 (https://gitlab.kitware.com/vtk/vtk/issues/17350, fixed in next release)
+  patch -p1 -i ../4490.patch
 }
 
 build() {
-  cd "build"
+  cd build
 
   # to help cmake find java
   export JAVA_HOME=/usr/lib/jvm/default
@@ -76,7 +80,7 @@
 
   local _tkver=$(echo 'puts $tcl_version' | tclsh)
 
-  cmake \
+  cmake ../VTK-${pkgver} \
     -Wno-dev \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_LIBDIR=lib \
@@ -96,19 +100,18 @@
     -DVTK_WRAP_PYTHON:BOOL=ON \
     -DVTK_WRAP_TCL:BOOL=ON \
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-    -DVTK_PYTHON_VERSION="2" \
+    -DVTK_PYTHON_VERSION="3" \
     -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
     -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
     -DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \
     ${cmake_system_flags} \
-    -DCMAKE_BUILD_TYPE=Release \
-    "${srcdir}/VTK-${pkgver}"
+    -DCMAKE_BUILD_TYPE=Release
 
   make
 }
 
 package() {
-  cd "build"
+  cd build
 
   make DESTDIR="${pkgdir}" install
   # remove xdmf cmake config file
@@ -117,11 +120,10 @@
   # Move the vtk.jar to the arch-specific location
   install -dv "${pkgdir}/usr/share/java/vtk"
   mv -v "${pkgdir}/usr/lib/vtk.jar" "${pkgdir}/usr/share/java/vtk"
-  rm -rf "${pkgdir}/usr/lib/vtk-${_majorver}/java"
+  rm -rf "${pkgdir}/usr/lib/vtk-${pkgver%.*}/java"
 
   # Install license
-  install -Dm644 "${srcdir}/VTK-${pkgver}/Copyright.txt" \
-                 "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -Dm644 "${srcdir}/VTK-${pkgver}/Copyright.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 
   # Fix path of QtDesigner plugin
   install -dv "${pkgdir}/usr/lib/qt"