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

[Bruno Pagani]

    Date: Wednesday, June 29, 2022 @ 19:51:22
  Author: archange
Revision: 1241316

Add libzip support, properly fix pnetcdf test

Modified:
  netcdf-openmpi/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-29 19:51:11 UTC (rev 1241315)
+++ PKGBUILD	2022-06-29 19:51:22 UTC (rev 1241316)
@@ -6,12 +6,12 @@
 _mpi=openmpi
 pkgname=${_pkg}-${_mpi}
 pkgver=4.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library with parallel support (${_mpi} version)"
 arch=(x86_64)
 url="https://www.unidata.ucar.edu/software/netcdf/"
 license=(custom)
-depends=("hdf5-${_mpi}" "pnetcdf-${_mpi}" curl libxml2)
+depends=("hdf5-${_mpi}" "pnetcdf-${_mpi}" curl libxml2 libzip)
 makedepends=(cmake)
 optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings')
 checkdepends=(inetutils unzip)
@@ -20,10 +20,12 @@
 options=(!makeflags)
 source=(https://github.com/Unidata/netcdf-c/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
         netcdf-4.9.0-fix-cmake-typo.patch::https://github.com/Unidata/netcdf-c/pull/2412.patch
-        netcdf-4.9.0-read-chunk-size.patch::https://github.com/Unidata/netcdf-c/pull/2319.patch)
+        netcdf-4.9.0-read-chunk-size.patch::https://github.com/Unidata/netcdf-c/pull/2319.patch
+        netcdf-4.9.0-pnetcdf-test.patch::https://github.com/Unidata/netcdf-c/pull/2437.patch)
 sha256sums=('9f4cb864f3ab54adb75409984c6202323d2fc66c003e5308f3cdf224ed41c0a6'
             'ed45ae6c49cf8dcddaadef4c5cf403049bf3f761187413d7b03754d319345d6a'
-            'd71b441b6499d6ddb97ea25377018000781d16de6551f0d2ba33b9bcd6e769fd')
+            'd71b441b6499d6ddb97ea25377018000781d16de6551f0d2ba33b9bcd6e769fd'
+            '66f7ec8474acb8d04ef5b5cd871b6b0178c8a4d6a2f1661a9566c96a780a54ae')
 prepare() {
   # https://github.com/Unidata/netcdf-c/issues/2188 https://github.com/Unidata/netcdf-c/issues/2242
   sed -i "/tst_remote3/d" ${_pkg}-c-${pkgver}/ncdap_test/CMakeLists.txt
@@ -31,8 +33,8 @@
   patch -p1 -d ${_pkg}-c-${pkgver} < netcdf-4.9.0-fix-cmake-typo.patch
   # https://github.com/Unidata/netcdf-c/issues/2418
   patch -p1 -d ${_pkg}-c-${pkgver} < netcdf-4.9.0-read-chunk-size.patch
-  # https://github.com/Unidata/netcdf-c/issues/24
-  sed -i "/run_pnetcdf_test/d" ${_pkg}-c-${pkgver}/nc_test/CMakeLists.txt
+  # https://github.com/Unidata/netcdf-c/issues/2435
+  patch -p1 -d ${_pkg}-c-${pkgver} < netcdf-4.9.0-pnetcdf-test.patch
 }
 
 build() {