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

[Antonio Rojas]

    Date: Thursday, July 16, 2020 @ 10:10:27
  Author: arojas
Revision: 664106

jsoncpp 1.8.3 rebuild

Modified:
  vtk/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-16 08:06:31 UTC (rev 664105)
+++ PKGBUILD	2020-07-16 10:10:27 UTC (rev 664106)
@@ -6,7 +6,7 @@
 
 pkgname=vtk
 pkgver=8.2.0
-pkgrel=13
+pkgrel=14
 pkgdesc="A software system for 3D computer graphics, image processing, and visualization"
 arch=(x86_64)
 url="https://www.vtk.org/"
@@ -45,13 +45,17 @@
         "${url}/files/release/${pkgver%.*}/VTKData-${pkgver}.tar.gz"
         "${url}/files/release/${pkgver%.*}/VTKLargeData-${pkgver}.tar.gz"
         proj6.patch
-        vtk-python-3.8.patch::"https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch")
+        vtk-python-3.8.patch::"https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch"
+        vtk-gcc10.patch::"https://gitlab.kitware.com/vtk/vtk/-/commit/a9079bdc.patch"
+        vtk-qt5.15.patch::"https://gitlab.kitware.com/vtk/vtk/-/commit/797f2869.patch")
 options=(staticlibs)
 sha512sums=('521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286'
             '517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b'
             '8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588'
             'bd095a848c198752307d6924eaa46d07af4fbbba70f4665e10c8b5dd8d2a84cb6d9ea6c25705463a6c054c5afa5af4c68030ad90d37953672c0fc609eaf24b07'
-            '0dcc47e66b758fc0db5c0bd84ebc82a6bd4b788df477d53e159aa3d02ea736333db8b4ef1cbfa222d4d322ff26ed5e725e1aed0083e6193626aa2deb96f0f3f3')
+            '9b85600812b6caf5007cdaeff34a504fa706bd0e1412dd306f8424b39edde430d8eedddcb53ce987afb6799ffc571f3fb9de80106324782e9d5b37947e92dcd6'
+            '5432ae62773377301a6709de0b789b1d5a459e467e4796b3d275c8a1cec6962fd8ebf404f8f11ed63a8d525c2d5a8dd163080d8fd3e483f3a5e06739133acd8f'
+            'a82df18ed019fe798b740c707e6511ea28b200ddd887054346508ead0aa91a847de15aa5f668c9cb87792424d2ead3600e59f7acc76e003477bc5f630cbbadaa')
 
 prepare() {
   mkdir build
@@ -63,6 +67,13 @@
   # Fix build with python 3.8
   patch -p1 -i ../vtk-python-3.8.patch
 
+  # Fix build with GCC 10
+  patch -d ThirdParty/exodusII/vtkexodusII -p1 -i "$srcdir"/vtk-gcc10.patch
+  sed -e 's|REGEX MATCH \"\[3-9\]|REGEX MATCH \"[1-9][0-9]|' -i CMake/VTKGenerateExportHeader.cmake
+
+  # Fix build with Qt 5.15
+  patch -p1 -i ../vtk-qt5.15.patch
+
   # Fix build with Java 12
   sed -i 's/VTK_JAVA_SOURCE_VERSION "1.6"/VTK_JAVA_SOURCE_VERSION "1.7"/
           s/VTK_JAVA_TARGET_VERSION "1.6"/VTK_JAVA_TARGET_VERSION "1.7"/' Wrapping/Java/CMakeLists.txt