Update to 2.5.2

3 files changed, 92 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d89acb50d92e..5f4739c9cf9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = r-haven
 	pkgdesc = Import and Export 'SPSS', 'Stata' and 'SAS' Files
-	pkgver = 2.5.1
-	pkgrel = 1
+	pkgver = 2.5.2
+	pkgrel = 4
 	url = https://cran.r-project.org/package=haven
-	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = make
-	depends = r>=3.2
-	depends = r-forcats>=0.2.0
+	checkdepends = r-testthat
+	makedepends = r-cpp11
+	depends = r-cli
+	depends = r-forcats
 	depends = r-hms
-	depends = r-readr>=0.1.0
-	depends = r-rlang>=0.4.0
+	depends = r-lifecycle
+	depends = r-readr
+	depends = r-rlang
 	depends = r-tibble
 	depends = r-tidyselect
-	depends = r-vctrs>=0.3.0
-	depends = r-cpp11
-	optdepends = r-cli
+	depends = r-vctrs
+	depends = readstat
 	optdepends = r-covr
 	optdepends = r-crayon
 	optdepends = r-fs
@@ -24,7 +24,12 @@ pkgbase = r-haven
 	optdepends = r-pillar
 	optdepends = r-rmarkdown
 	optdepends = r-testthat
-	source = https://cran.r-project.org/src/contrib/haven_2.5.1.tar.gz
-	sha256sums = 9f40462097a0b1cf3831bca493851fe4a6b3570d957a775ca81940f241c50a70
+	optdepends = r-utf8
+	source = https://cran.r-project.org/src/contrib/haven_2.5.2.tar.gz
+	source = system-readstat.patch
+	md5sums = 0af8d195565a63afc29068db0f2f68ab
+	md5sums = 73da7cc2ff7f7c1a5d4ffbaa45e359df
+	sha256sums = 2131fb0377ae1beffae54bf4beb8b3a876e9b6b9841a5acc39a2a2615023561d
+	sha256sums = 8986ddaefd714bd4d2a42364863437116b14f38275196720d88d247794b94bf8
 
 pkgname = r-haven
diff --git a/PKGBUILD b/PKGBUILD
index 8e9af5fcf020..1bd83a07820d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,73 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Matt Frichtl <frichtlm@gmail.com>
 # Contributor: Taekyung Kim <Taekyung.Kim.Maths@gmail.com>
 # Contributor: Alex Branham <branham@utexas.edu>
 
-_cranname=haven
-_cranver=2.5.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=haven
+_pkgver=2.5.2
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=4
 pkgdesc="Import and Export 'SPSS', 'Stata' and 'SAS' Files"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
-depends=('r>=3.2' 'r-forcats>=0.2.0' r-hms 'r-readr>=0.1.0' 'r-rlang>=0.4.0' r-tibble r-tidyselect 'r-vctrs>=0.3.0' r-cpp11)
-makedepends=(make)
-optdepends=(r-cli r-covr r-crayon r-fs r-knitr r-pillar r-rmarkdown r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('9f40462097a0b1cf3831bca493851fe4a6b3570d957a775ca81940f241c50a70')
+depends=(
+  r-cli
+  r-forcats
+  r-hms
+  r-lifecycle
+  r-readr
+  r-rlang
+  r-tibble
+  r-tidyselect
+  r-vctrs
+  readstat
+)
+makedepends=(
+  r-cpp11
+)
+checkdepends=(
+  r-testthat
+)
+optdepends=(
+  r-covr
+  r-crayon
+  r-fs
+  r-knitr
+  r-pillar
+  r-rmarkdown
+  r-testthat
+  r-utf8
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "system-readstat.patch")
+md5sums=('0af8d195565a63afc29068db0f2f68ab'
+         '73da7cc2ff7f7c1a5d4ffbaa45e359df')
+sha256sums=('2131fb0377ae1beffae54bf4beb8b3a876e9b6b9841a5acc39a2a2615023561d'
+            '8986ddaefd714bd4d2a42364863437116b14f38275196720d88d247794b94bf8')
+
+prepare() {
+  # build with system readstat
+  patch -Np1 -i system-readstat.patch
+}
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/system-readstat.patch b/system-readstat.patch
new file mode 100644
index 000000000000..5b02a463b0ba
--- /dev/null
+++ b/system-readstat.patch
@@ -0,0 +1,14 @@
+diff --git a/haven/src/Makevars.in b/haven/src/Makevars.in
+index 27c35b6..f805d61 100644
+--- a/haven/src/Makevars.in
++++ b/haven/src/Makevars.in
+@@ -4,8 +4,5 @@ CPPFILES = $(wildcard *.cpp)
+ SOURCES = $(CFILES) $(CPPFILES)
+ 
+ # This must be defined identically in Makevars.win
+-OBJECTS = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
+ 
+-PKG_CFLAGS = @cflags@ -Ireadstat -DHAVE_ZLIB
+-PKG_CXXFLAGS = @cflags@ -Ireadstat -DHAVE_ZLIB
+-PKG_LIBS = @libs@
++PKG_LIBS = -lreadstat