summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD19
-rw-r--r--fix-build.patch28
3 files changed, 10 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 26e3f49ed20c..147863612440 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = r-rhdf5
pkgdesc = R Interface to HDF5
- pkgver = 2.46.1
- pkgrel = 2
+ pkgver = 2.48.0
+ pkgrel = 1
url = https://bioconductor.org/packages/rhdf5
arch = x86_64
license = Artistic-2.0
@@ -9,7 +9,6 @@ pkgbase = r-rhdf5
depends = openssl
depends = r-rhdf5filters
depends = r-rhdf5lib
- depends = r-s4vectors
depends = zlib
optdepends = r-bench
optdepends = r-biocparallel
@@ -21,11 +20,8 @@ pkgbase = r-rhdf5
optdepends = r-mockery
optdepends = r-rmarkdown
optdepends = r-testthat
- source = https://bioconductor.org/packages/release/bioc/src/contrib/rhdf5_2.46.1.tar.gz
- source = fix-build.patch
- md5sums = 947e662fe5f427ed0cc839e8049b431e
- md5sums = e7763c1284318e623c69572315650118
- b2sums = 6915bc95d312b394a315b55935c37e6cb4be5f6207eb46ff61c1b2933409d612cccf4920d2cc650e563959c0acfcf3b1421bdd17a72cce18034c7b0f971d0253
- b2sums = f776cc9e80195b4e4dbfe85e0bf3da4c5dc1967219120072949e847ec725283e74293a71cd51a6d6b57dd54b5f2aae80c4150ba30cb74efdd83fb2b135ae5698
+ source = https://bioconductor.org/packages/release/bioc/src/contrib/rhdf5_2.48.0.tar.gz
+ md5sums = c5ed00dbade32b03ccd37f110970ad3e
+ b2sums = cb1857d4d9b54d409cece482b7a39e25885565ab212b6692cf8155873a87d8dc587a545e634adbe3e1f12534ab354abb790ed76bb310d825abe62fd2a9395332
pkgname = r-rhdf5
diff --git a/PKGBUILD b/PKGBUILD
index 6a01d76cbf64..5239bc679c62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
_pkgname=rhdf5
-_pkgver=2.46.1
+_pkgver=2.48.0
pkgname=r-${_pkgname,,}
pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=1
pkgdesc="R Interface to HDF5"
arch=(x86_64)
url="https://bioconductor.org/packages/$_pkgname"
@@ -14,7 +14,6 @@ depends=(
openssl
r-rhdf5filters
r-rhdf5lib
- r-s4vectors
zlib
)
optdepends=(
@@ -29,17 +28,9 @@ optdepends=(
r-rmarkdown
r-testthat
)
-source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
- "fix-build.patch")
-md5sums=('947e662fe5f427ed0cc839e8049b431e'
- 'e7763c1284318e623c69572315650118')
-b2sums=('6915bc95d312b394a315b55935c37e6cb4be5f6207eb46ff61c1b2933409d612cccf4920d2cc650e563959c0acfcf3b1421bdd17a72cce18034c7b0f971d0253'
- 'f776cc9e80195b4e4dbfe85e0bf3da4c5dc1967219120072949e847ec725283e74293a71cd51a6d6b57dd54b5f2aae80c4150ba30cb74efdd83fb2b135ae5698')
-
-prepare() {
- # fix format string errors
- patch -Np1 -i fix-build.patch
-}
+source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('c5ed00dbade32b03ccd37f110970ad3e')
+b2sums=('cb1857d4d9b54d409cece482b7a39e25885565ab212b6692cf8155873a87d8dc587a545e634adbe3e1f12534ab354abb790ed76bb310d825abe62fd2a9395332')
build() {
mkdir build
diff --git a/fix-build.patch b/fix-build.patch
deleted file mode 100644
index 0facb3e5e95f..000000000000
--- a/fix-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/rhdf5/src/H5E.c b/rhdf5/src/H5E.c
-index cbb1388..eac0700 100644
---- a/rhdf5/src/H5E.c
-+++ b/rhdf5/src/H5E.c
-@@ -114,9 +114,9 @@ herr_t _rhdf5PrintErrorR( hid_t estack_id, void * stream) {
- strcat(str, "\n");
- strcat(str, client_data.txt[i]);
- }
-- error(str);
-+ error("%s", str);
- } else if (client_data.n == 1) {
-- error(client_data.txt[0]);
-+ error("%s", client_data.txt[0]);
- } else {
- error("libhdf5 (no error message captured).");
- }
-@@ -146,9 +146,9 @@ herr_t _rhdf5PrintErrorRcompact( hid_t estack_id, void * stream) {
- strcat(str, "\n");
- strcat(str, client_data.txt[i]);
- }
-- error(str);
-+ error("%s", str);
- } else if (client_data.n == 1) {
-- error(client_data.txt[0]);
-+ error("%s", client_data.txt[0]);
- } else {
- error("libhdf5 (no error message captured).");
- }