[lilac] updated to 2.3.0-3

3 files changed, 76 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf0fd6d3dc05..06ba492c5a9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = r-zip
 	pkgdesc = Cross-Platform 'zip' Compression
 	pkgver = 2.3.0
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=zip
 	arch = x86_64
 	license = MIT
+	checkdepends = r-testthat
 	depends = r
 	optdepends = r-covr
 	optdepends = r-processx
@@ -12,6 +13,10 @@ pkgbase = r-zip
 	optdepends = r-testthat
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/zip_2.3.0.tar.gz
-	sha256sums = 33eba844922af9981732ee6ec1582d46cf04c562344f09a0f0f14a22c6f74543
+	source = libr-zip.patch
+	md5sums = 4f4294028c8902df55475b69a249c06c
+	md5sums = 66828a1ae6c6d7bb94b97864f6b57029
+	b2sums = c2a0b41370f73b42d24101d53077f48bb818637e1bdb2da1b4ad11b2c0284ed21784144ed35248a397d951b45419b1911cb7b89c27a9b0f04c06bfaafc55f9de
+	b2sums = bd8012554ac72052ca748acc8990a20d685788fc03ff17036fa83f7ec3c82a63026f567bd1c84ae0980213d82ed2c93211de299cd9657d59e2cff8a9b69fc7f2
 
 pkgname = r-zip
diff --git a/PKGBUILD b/PKGBUILD
index 02801eb17d34..88e05e44960f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,23 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
-# 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: Alex Branham <branham@utexas.edu>
 
 _pkgname=zip
 _pkgver=2.3.0
 pkgname=r-${_pkgname,,}
-pkgver=2.3.0
-pkgrel=1
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="Cross-Platform 'zip' Compression"
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('MIT')
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=(MIT)
 depends=(
   r
 )
+checkdepends=(
+  r-testthat
+)
 optdepends=(
   r-covr
   r-processx
@@ -21,16 +25,36 @@ optdepends=(
   r-testthat
   r-withr
 )
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('33eba844922af9981732ee6ec1582d46cf04c562344f09a0f0f14a22c6f74543')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "libr-zip.patch")
+md5sums=('4f4294028c8902df55475b69a249c06c'
+         '66828a1ae6c6d7bb94b97864f6b57029')
+b2sums=('c2a0b41370f73b42d24101d53077f48bb818637e1bdb2da1b4ad11b2c0284ed21784144ed35248a397d951b45419b1911cb7b89c27a9b0f04c06bfaafc55f9de'
+        'bd8012554ac72052ca748acc8990a20d685788fc03ff17036fa83f7ec3c82a63026f567bd1c84ae0980213d82ed2c93211de299cd9657d59e2cff8a9b69fc7f2')
+
+prepare() {
+  # fix LDFLAGS, put common functionality into libr-zip.so
+  patch -Np1 -i libr-zip.patch
+}
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir build
+  # set LD_LIBRARY_PATH for libr-zip.so
+  LD_LIBRARY_PATH="$srcdir/$_pkgname/src" R CMD INSTALL -l build "$_pkgname"
+}
+
+check() {
+  cd "$_pkgname/tests"
+  LD_LIBRARY_PATH="$srcdir/$_pkgname/src" R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
-  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$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"
+
+  # move libr-zip.so to /usr/lib
+  mv "$pkgdir/usr/lib/R/library/$_pkgname/libs/libr-zip.so" "$pkgdir/usr/lib"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/libr-zip.patch b/libr-zip.patch
new file mode 100644
index 000000000000..9b3004c3250e
--- /dev/null
+++ b/libr-zip.patch
@@ -0,0 +1,31 @@
+diff --git a/zip/src/Makevars b/zip/src/Makevars
+index 660aff8..87df0bd 100644
+--- a/zip/src/Makevars
++++ b/zip/src/Makevars
+@@ -1,15 +1,21 @@
+ 
+-OBJECTS = init.o miniz.o rzip.o zip.o unixutils.o
++OBJECTS = init.o rzip.o
++PKG_LIBS = -L. -lr-zip
+ 
+ .PHONY: all clean
+ 
+ all: tools/cmdzip tools/cmdunzip $(SHLIB)
+ 
+-tools/cmdzip: miniz.c zip.c unixutils.c tools/cmdzip.c
+-	$(CC) $(CFLAGS) miniz.c zip.c unixutils.c tools/cmdzip.c -o tools/cmdzip
++tools/cmdzip: tools/cmdzip.o libr-zip.so
++	$(CC) $(LDFLAGS) -o $@ $^
+ 
+-tools/cmdunzip: miniz.c zip.c unixutils.c tools/cmdunzip.c
+-	$(CC) $(CFLAGS) miniz.c zip.c unixutils.c tools/cmdunzip.c -o tools/cmdunzip
++tools/cmdunzip: tools/cmdunzip.o libr-zip.so
++	$(CC) $(LDFLAGS) -o $@ $^
++
++$(SHLIB): libr-zip.so
++
++libr-zip.so: miniz.o zip.o unixutils.o
++	$(CC) -shared $(LDFLAGS) -o $@ $^
+ 
+ clean:
+ 	rm -rf $(SHLIB) $(OBJECTS) \