From 625c1564c87fab010c7afc485047d69344f3f5b7 Mon Sep 17 00:00:00 2001 From: Holger Jaekel Date: Thu, 15 Apr 2021 22:16:36 +0200 Subject: community/netcdf: upgrade to 4.8.0 --- community/netcdf/APKBUILD | 20 +++++++++++--------- community/netcdf/byteswap.patch | 18 ------------------ 2 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 community/netcdf/byteswap.patch diff --git a/community/netcdf/APKBUILD b/community/netcdf/APKBUILD index 6e4e3c791e3..25a904a0e51 100644 --- a/community/netcdf/APKBUILD +++ b/community/netcdf/APKBUILD @@ -1,12 +1,11 @@ # Contributor: Holger Jaekel # Maintainer: Holger Jaekel pkgname=netcdf -pkgver=4.7.4 -pkgrel=1 +pkgver=4.8.0 +pkgrel=0 pkgdesc="Libraries for the Unidata network Common Data Format" url="https://www.unidata.ucar.edu/software/netcdf/" -# s390x: error: static declaration of 'byteswap8' follows non-static declaration -arch="all !armhf !armv7 !mips !mips64" # disabling on mips, armhf and armv7 as tests fail +arch="all !mips !mips64 !s390x" # disabling on mips as tests fail; disabled on s390x because of https://github.com/Unidata/netcdf-c/issues/1987 license="BSD-3-Clause" makedepends=" bash @@ -22,8 +21,8 @@ subpackages=" $pkgname-utils:utils " source="$pkgname-$pkgver.tar.gz::https://github.com/Unidata/netcdf-c/archive/v$pkgver.tar.gz - byteswap.patch fix-test-on-big-endian.patch + tst_h_atts3.patch::https://github.com/Unidata/netcdf-c/commit/9fc8ae62a8564e095ff17f4612874581db0e4db5.diff " builddir="$srcdir/$pkgname-c-$pkgver" @@ -58,8 +57,11 @@ utils() { check() { # One test failure in nc_test as reported in https://github.com/Unidata/netcdf-c/issues/808 - ctest -E nc_test + # Server test.opendap.org:8080 seems to be down for dap4_test_test_hyrax test + ctest -E 'nc_test|dap4_test_test_hyrax' } -sha512sums="15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79 netcdf-4.7.4.tar.gz -fa74a75eb064901878dc37b2049534bec7571885393f78692d7ac27ad9a1ec622574bf4bbfdb741d714c45b4a0b8a1ebbd532277603c154d50513eecad70d002 byteswap.patch -29dda7a0e28333afb91f948c1f5527606634ab8014c6f123e73b092e550d9514c45391f11b33c59cbfbb1fd1ff581848305a47d3768f9b4d1a2be63609009d82 fix-test-on-big-endian.patch" +sha512sums=" +367017338954f1cc2da00a93e7a79f17bbee447a655f98dfa35cac95cd002c40d6122eec9c5670376fad109c2266254ff6e9c82e197b488fcc412790d5b27088 netcdf-4.8.0.tar.gz +29dda7a0e28333afb91f948c1f5527606634ab8014c6f123e73b092e550d9514c45391f11b33c59cbfbb1fd1ff581848305a47d3768f9b4d1a2be63609009d82 fix-test-on-big-endian.patch +1e6aaf95741e18ae5eb77b45f7c8cbf449a13a0d4aada34c4a75026c293d302f8d26a04e72fa83cfddc40a978be0810ad8c9e9c5e7cc6833d92d3d9c08ff910c tst_h_atts3.patch +" diff --git a/community/netcdf/byteswap.patch b/community/netcdf/byteswap.patch deleted file mode 100644 index eb4305be6a6..00000000000 --- a/community/netcdf/byteswap.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Add forward declarations for byteswap8 & byteswap4. -Author: Dennis Heimbigner -Bug: https://github.com/Unidata/netcdf-c/issues/1687 - -diff --git a/libdispatch/dfilter.c b/libdispatch/dfilter.c -index 8938464..8efe591 100644 ---- a/libdispatch/dfilter.c -+++ b/libdispatch/dfilter.c -@@ -20,6 +20,9 @@ - #include "hdf5internal.h" - #endif - -+static void byteswap8(unsigned char*); -+static void byteswap4(unsigned char*); -+ - /* - Unified filter related code - */ -- cgit v1.2.3