diff --git a/community/netcdf/PKGBUILD b/community/netcdf/PKGBUILD index 8d78fd25f..53a1f2ab3 100644 --- a/community/netcdf/PKGBUILD +++ b/community/netcdf/PKGBUILD @@ -7,7 +7,7 @@ pkgname=netcdf pkgver=4.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library" arch=(x86_64) url="https://www.unidata.ucar.edu/software/netcdf/" @@ -18,16 +18,22 @@ optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings') options=(!makeflags) license=(custom) 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/commit/80a6611cfca98a5979c5ac69cba56a49af8c1e48.patch) + netcdf-4.9.0-fix-cmake-typo.patch::https://github.com/Unidata/netcdf-c/issues/2412.patch + netcdf-4.9.0-read-chunk-size.patch::https://github.com/Unidata/netcdf-c/pull/2319.patch) sha256sums=('9f4cb864f3ab54adb75409984c6202323d2fc66c003e5308f3cdf224ed41c0a6' - 'ed45ae6c49cf8dcddaadef4c5cf403049bf3f761187413d7b03754d319345d6a') + 'ed45ae6c49cf8dcddaadef4c5cf403049bf3f761187413d7b03754d319345d6a' + 'd71b441b6499d6ddb97ea25377018000781d16de6551f0d2ba33b9bcd6e769fd') prepare() { + # https://github.com/Unidata/netcdf-c/issues/2188 https://github.com/Unidata/netcdf-c/issues/2242 + sed -i "/tst_remote3/d" ${pkgname}-c-${pkgver}/ncdap_test/CMakeLists.txt + # https://github.com/Unidata/netcdf-c/issues/2390 patch -p1 -d ${pkgname}-c-${pkgver} < netcdf-4.9.0-fix-cmake-typo.patch + # https://github.com/Unidata/netcdf-c/issues/2418 + patch -p1 -d ${pkgname}-c-${pkgver} < netcdf-4.9.0-read-chunk-size.patch } build() { - # Disabling remote tests because of https://github.com/Unidata/netcdf-c/issues/2188 [[ $CARCH != "aarch64" ]] && CDFS="OFF" || CDFS="ON" cmake -B build -S ${pkgname}-c-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -35,8 +41,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DENABLE_BYTERANGE=ON \ -DENABLE_CDF5=${CDFS} \ - -DENABLE_DAP_LONG_TESTS=OFF \ - -DENABLE_DAP_REMOTE_TESTS=OFF \ + -DENABLE_DAP_LONG_TESTS=ON \ + -DENABLE_DAP_REMOTE_TESTS=ON \ -DENABLE_EXAMPLE_TESTS=ON \ -DENABLE_EXTRA_TESTS=ON \ -DENABLE_FILTER_TESTING=ON \ @@ -46,8 +52,7 @@ build() { } check() { - # https://github.com/Unidata/netcdf-c/issues/2418 - make -C build test || echo "Tests failed" + make -C build test } package() {