[lilac] updated to 1.3.12-3

2 files changed, 39 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22be0108a72f..52f37fb2d0a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
 pkgbase = r-rttf2pt1
 	pkgdesc = 'ttf2pt1' Program
-	pkgver = 1.3.9
-	pkgrel = 1
+	pkgver = 1.3.12
+	pkgrel = 3
 	url = https://cran.r-project.org/package=Rttf2pt1
-	arch = i686
 	arch = x86_64
 	license = custom
-	depends = r>=2.15
-	source = https://cran.r-project.org/src/contrib/Rttf2pt1_1.3.9.tar.gz
-	sha256sums = 8667e48ed639c80180b1c1b65eff6ca2031bc9633a4fe79b50772f92375e3e71
+	depends = r
+	source = https://cran.r-project.org/src/contrib/Rttf2pt1_1.3.12.tar.gz
+	source = Rttf2pt1-use-ldflags.patch::https://github.com/wch/Rttf2pt1/pull/23.patch
+	md5sums = 993029fbdbaeb22d5b20368d071a1dcd
+	md5sums = 5b143bc1fa8b037ad0a72da32165e7bf
+	sha256sums = 0b4b7a303990369a6944de817b6bd220b400942fcabf42c04fb5b56f1b40a583
+	sha256sums = 27bacf2cae051bca1598f5c062f2cf1fbd4101e5bb8034c0585e2840d80d8cb6
 
 pkgname = r-rttf2pt1
diff --git a/PKGBUILD b/PKGBUILD
index 624f274eb156..b01a48ec6fb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,41 @@
+# 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=Rttf2pt1
-_cranver=1.3.9
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=Rttf2pt1
+_pkgver=1.3.12
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="'ttf2pt1' Program"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(custom)
-depends=('r>=2.15')
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('8667e48ed639c80180b1c1b65eff6ca2031bc9633a4fe79b50772f92375e3e71')
+depends=(
+  r
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "$_pkgname-use-ldflags.patch::https://github.com/wch/Rttf2pt1/pull/23.patch")
+md5sums=('993029fbdbaeb22d5b20368d071a1dcd'
+         '5b143bc1fa8b037ad0a72da32165e7bf')
+sha256sums=('0b4b7a303990369a6944de817b6bd220b400942fcabf42c04fb5b56f1b40a583'
+            '27bacf2cae051bca1598f5c062f2cf1fbd4101e5bb8034c0585e2840d80d8cb6')
+
+prepare() {
+  cd "$_pkgname"
+  # use LDFLAGS
+  patch -Np1 -i "../$_pkgname-use-ldflags.patch"
+}
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 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"
 }