[lilac] updated to 1.62.0-1

3 files changed, 38 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 813452e02715..cf1fa8d9901d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-hilbertvisgui
 	pkgdesc = HilbertVisGUI
-	pkgver = 1.60.0
-	pkgrel = 2
+	pkgver = 1.62.0
+	pkgrel = 1
 	url = https://bioconductor.org/packages/HilbertVisGUI
 	arch = x86_64
 	license = GPL-3.0-or-later
@@ -13,8 +13,11 @@ pkgbase = r-hilbertvisgui
 	depends = pangomm
 	depends = r-hilbertvis
 	optdepends = r-iranges
-	source = https://bioconductor.org/packages/release/bioc/src/contrib/HilbertVisGUI_1.60.0.tar.gz
-	md5sums = e9e6a2cce82ff0dfcf0828ae7d123537
-	b2sums = cafe62163b23afa93b138788e4a0b91c0af1fb338822beb27e64176944fb2efd3c1882a15ff97a36290a54c1cf3884dda399196bf11018923eb1d56f89b90854
+	source = https://bioconductor.org/packages/release/bioc/src/contrib/HilbertVisGUI_1.62.0.tar.gz
+	source = fix-build.patch
+	md5sums = 6d0838301b345c1f905c10a7a90ea8b4
+	md5sums = 950ae2bcf091fb161716d590be861702
+	b2sums = b87b9c986a81a863ff0839d2d049c28b65889cb0a37a9a462ec5156941a0f318c44449fb8077de8c1ffa3f0f92b39f883157632c7a40d539c963e8cabee740ca
+	b2sums = 83a2e27a153a6037fb03d6d960be93e76ec62ed5f130aaf63c456c75ac0faed9197264505199e95aa15acbc7765fb9aeadc8532432a44fa81a6c64b64de5d849
 
 pkgname = r-hilbertvisgui
diff --git a/PKGBUILD b/PKGBUILD
index b87c6b4e8624..09bfd22b7fa3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=HilbertVisGUI
-_pkgver=1.60.0
+_pkgver=1.62.0
 pkgname=r-${_pkgname,,}
 pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="HilbertVisGUI"
 arch=(x86_64)
 url="https://bioconductor.org/packages/$_pkgname"
@@ -21,9 +21,17 @@ depends=(
 optdepends=(
   r-iranges
 )
-source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-md5sums=('e9e6a2cce82ff0dfcf0828ae7d123537')
-b2sums=('cafe62163b23afa93b138788e4a0b91c0af1fb338822beb27e64176944fb2efd3c1882a15ff97a36290a54c1cf3884dda399196bf11018923eb1d56f89b90854')
+source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "fix-build.patch")
+md5sums=('6d0838301b345c1f905c10a7a90ea8b4'
+         '950ae2bcf091fb161716d590be861702')
+b2sums=('b87b9c986a81a863ff0839d2d049c28b65889cb0a37a9a462ec5156941a0f318c44449fb8077de8c1ffa3f0f92b39f883157632c7a40d539c963e8cabee740ca'
+        '83a2e27a153a6037fb03d6d960be93e76ec62ed5f130aaf63c456c75ac0faed9197264505199e95aa15acbc7765fb9aeadc8532432a44fa81a6c64b64de5d849')
+
+prepare() {
+  # fix format string errors
+  patch -Np1 -i fix-build.patch
+}
 
 build() {
   mkdir build
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 000000000000..5b61c567ff70
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,17 @@
+diff --git a/HilbertVisGUI/src/R_interface.cc b/HilbertVisGUI/src/R_interface.cc
+index ba92660..e9064c1 100644
+--- a/HilbertVisGUI/src/R_interface.cc
++++ b/HilbertVisGUI/src/R_interface.cc
+@@ -522,11 +522,9 @@ extern "C" SEXP R_display_hilbert( SEXP args)
+          for( int j = 0; j < i; j++ )
+             delete (*dataCols)[j];
+          delete dataCols;
+-         char buf[300];
+-         snprintf( buf, 300, i < Rf_length( seqnames ) ? 
++         Rf_error( i < Rf_length( seqnames ) ?
+             "R_display_hilbert: Data vector #%d is not a vector of integers or reals notan Rle object." :
+             "R_display_hilbert: Data vector #%d does not have a name in second argument.", i+1 );
+-         Rf_error( buf );
+       }
+       Glib::ustring name = CHAR(STRING_ELT( seqnames, i ));
+       long fl = ( ( full_lengths != R_NilValue ) && ( i < Rf_length(full_lengths) ) &&