diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | system-cctz.patch | 7 |
3 files changed, 21 insertions, 22 deletions
@@ -1,21 +1,21 @@ pkgbase = r-timechange pkgdesc = Efficient Manipulation of Date-Times - pkgver = 0.2.0 - pkgrel = 2 + pkgver = 0.3.0 + pkgrel = 1 url = https://cran.r-project.org/package=timechange arch = x86_64 - license = GPL3 + license = GPL-3.0-or-later checkdepends = r-testthat makedepends = r-cpp11 depends = cctz depends = r optdepends = r-knitr optdepends = r-testthat - source = https://cran.r-project.org/src/contrib/timechange_0.2.0.tar.gz + source = https://cran.r-project.org/src/contrib/timechange_0.3.0.tar.gz source = system-cctz.patch - md5sums = 9e8dea7a23e233cccec70f7838381582 - md5sums = a573af9ccae2bad5627178a50de35e5b - sha256sums = 3d602008052123daef94a5c3f5154c5461b4ec0432ab70c37273d7ddd252f7f1 - sha256sums = 77d128c19ede66d6f0a27d3751c15da2ac322bdf2ca0914d047ac36396156001 + md5sums = f62746e78800a3edb8bfdc2ceffe0722 + md5sums = 0111def4195dc0497273ed1c287e1906 + b2sums = 992441ced5f4bd1f707f2fe6172bfa838a399f0b58a36a818bdf643d20600f761b31ab09b632adc9475523c2fbdcf97c3e6cb670410a6ceb84719a13993550de + b2sums = b3178081cb18390b88fc540fe5ea29393336b03bb51b582c281c5dee371d7b419f3dec7acd02f850f853bad3fc2bbe2173eb9c8526a28abde5d030f7b95feb15 pkgname = r-timechange @@ -1,14 +1,14 @@ # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com> _pkgname=timechange -_pkgver=0.2.0 +_pkgver=0.3.0 pkgname=r-${_pkgname,,} pkgver=${_pkgver//-/.} -pkgrel=2 +pkgrel=1 pkgdesc="Efficient Manipulation of Date-Times" arch=(x86_64) -url="https://cran.r-project.org/package=${_pkgname}" -license=(GPL3) +url="https://cran.r-project.org/package=$_pkgname" +license=('GPL-3.0-or-later') depends=( cctz r @@ -25,10 +25,10 @@ optdepends=( ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" "system-cctz.patch") -md5sums=('9e8dea7a23e233cccec70f7838381582' - 'a573af9ccae2bad5627178a50de35e5b') -sha256sums=('3d602008052123daef94a5c3f5154c5461b4ec0432ab70c37273d7ddd252f7f1' - '77d128c19ede66d6f0a27d3751c15da2ac322bdf2ca0914d047ac36396156001') +md5sums=('f62746e78800a3edb8bfdc2ceffe0722' + '0111def4195dc0497273ed1c287e1906') +b2sums=('992441ced5f4bd1f707f2fe6172bfa838a399f0b58a36a818bdf643d20600f761b31ab09b632adc9475523c2fbdcf97c3e6cb670410a6ceb84719a13993550de' + 'b3178081cb18390b88fc540fe5ea29393336b03bb51b582c281c5dee371d7b419f3dec7acd02f850f853bad3fc2bbe2173eb9c8526a28abde5d030f7b95feb15') prepare() { # build against system cctz @@ -36,8 +36,8 @@ prepare() { } build() { - mkdir -p build - R CMD INSTALL "$_pkgname" -l build + mkdir build + R CMD INSTALL -l build "$_pkgname" } check() { diff --git a/system-cctz.patch b/system-cctz.patch index 5e123572da01..7f90d4709726 100644 --- a/system-cctz.patch +++ b/system-cctz.patch @@ -1,15 +1,14 @@ diff --git a/timechange/src/Makevars b/timechange/src/Makevars -index 7233aa3..25cd9ac 100644 +index f4c9fe2..36a8f54 100644 --- a/timechange/src/Makevars +++ b/timechange/src/Makevars -@@ -1,5 +1,5 @@ - CXX_STD = CXX11 +@@ -1,4 +1,4 @@ -PKG_CPPFLAGS= -I. -I./cctz/src/ +PKG_CPPFLAGS= -I. PKG_LIBS= -L. -lcctz LIBCCTZ=./cctz/src/time_zone_fixed.o \ -@@ -11,7 +11,7 @@ LIBCCTZ=./cctz/src/time_zone_fixed.o \ +@@ -10,7 +10,7 @@ LIBCCTZ=./cctz/src/time_zone_fixed.o \ ./cctz/src/time_zone_posix.o \ ./cctz/src/zone_info_source.o |