[lilac] updated to 1.1.1-4

3 files changed, 47 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80bbbb2d0d05..675b1cc2eb00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = r-fastmap
 	pkgdesc = Fast Data Structures
 	pkgver = 1.1.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=fastmap
-	arch = i686
 	arch = x86_64
 	license = MIT
 	checkdepends = r-testthat
@@ -11,8 +10,10 @@ pkgbase = r-fastmap
 	depends = r
 	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/fastmap_1.1.1.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	source = system-hopscotch-map.patch
+	md5sums = 57a70be74ce88c5dc7e97c5547526f9f
+	md5sums = bb23578b236de5d3de6a2fd2505814ba
 	sha256sums = 3623809dd016ae8abd235200ba7834effc4b916915a059deb76044137c5c7173
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
+	sha256sums = a189963fc1d1c913df21bc02d0ba17678965d628775c03d39c2ffb6d4624680d
 
 pkgname = r-fastmap
diff --git a/PKGBUILD b/PKGBUILD
index 51f5354985da..4b7dc3bda0cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,54 @@
 # 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
 
-_cranname=fastmap
-_cranver=1.1.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=fastmap
+_pkgver=1.1.1
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=4
 pkgdesc="Fast Data Structures"
-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)
-makedepends=(hopscotch-map)
-checkdepends=(r-testthat)
-optdepends=(r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
+depends=(
+  r
+)
+makedepends=(
+  hopscotch-map
+)
+checkdepends=(
+  r-testthat
+)
+optdepends=(
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "system-hopscotch-map.patch")
+md5sums=('57a70be74ce88c5dc7e97c5547526f9f'
+         'bb23578b236de5d3de6a2fd2505814ba')
 sha256sums=('3623809dd016ae8abd235200ba7834effc4b916915a059deb76044137c5c7173'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+            'a189963fc1d1c913df21bc02d0ba17678965d628775c03d39c2ffb6d4624680d')
 
 prepare() {
   # Use system hopscotch_map
-  sed -i '/PKG_CPPFLAGS=-Ilib/d' "${_cranname}/src/Makevars"
+  patch -Np1 -i system-hopscotch-map.patch
 }
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  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 "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
-
-  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/system-hopscotch-map.patch b/system-hopscotch-map.patch
new file mode 100644
index 000000000000..cfe1f85b9a46
--- /dev/null
+++ b/system-hopscotch-map.patch
@@ -0,0 +1,9 @@
+diff --git a/fastmap/src/Makevars b/fastmap/src/Makevars
+index bed55df..31d7752 100644
+--- a/fastmap/src/Makevars
++++ b/fastmap/src/Makevars
+@@ -1,4 +1,3 @@
+ # Require Rf_ prefix for R's functions, to avoid clashes.
+ PKG_CXXFLAGS=-DR_NO_REMAP
+ 
+-PKG_CPPFLAGS=-Ilib/