From b6ca9022b267c908199f10144658287bcd3e17bd Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 22 May 2023 16:55:21 +0200 Subject: [PATCH] vtk: rebuild for openxr-sdk update Also apply patches to fix compilation with ADIOS >= 2.9, GCC >= 13 --- mingw-w64-vtk/PKGBUILD | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mingw-w64-vtk/PKGBUILD b/mingw-w64-vtk/PKGBUILD index 5e1954fbc6..3ac7348681 100644 --- a/mingw-w64-vtk/PKGBUILD +++ b/mingw-w64-vtk/PKGBUILD @@ -5,7 +5,7 @@ _realname=vtk pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=9.2.6 -pkgrel=4 +pkgrel=5 pkgdesc="A software system for 3D computer graphics, image processing and visualization (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -105,10 +105,14 @@ else fi source=(https://www.vtk.org/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz "006-link-to-pdalcpp.patch" - "007-dll-export-some-functions.patch") + "007-dll-export-some-functions.patch" + "https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9857.patch" + "https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10113.patch") sha256sums=('06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12' 'af98e72a0d64af3fa755929e724e900faa9ab466917fc24084026512f02399e4' - 'a9b9292be90c259f0aa058e3f4a7a08b6218f20e6cb2a71e214acda2d2302a50') + 'a9b9292be90c259f0aa058e3f4a7a08b6218f20e6cb2a71e214acda2d2302a50' + 'f7a2cf8db2d3ee04460bf692c57cdf8bb9d8fca6dec69333e61f01d902294f07' + '79eae9ff919a36f79ba91916fdc8b2c7312713ad13a6972a6d38220f229b1887') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -130,6 +134,12 @@ prepare() { apply_patch_with_msg \ 007-dll-export-some-functions.patch fi + + # Fix compilation with newer ADIOS2 + apply_patch_with_msg 9857.patch + + # Fix compilation with GCC13 + apply_patch_with_msg 10113.patch } build() {