diff options
author | BioArchLinuxBot | 2023-07-02 12:08:12 +0000 |
---|---|---|
committer | BioArchLinuxBot | 2023-07-02 12:08:12 +0000 |
commit | 99402ab1613fe0763c3306ca9d0e1954bbe26418 (patch) | |
tree | f5628d808111281ce5da1bdb671a2b3fb9cc5456 | |
parent | 382467d78b397e08bfb83da922f19748d9f6af45 (diff) | |
download | aur-99402ab1613fe0763c3306ca9d0e1954bbe26418.tar.gz |
[lilac] updated to 1.6.11-2
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 64 | ||||
-rw-r--r-- | system-libuv.patch | 30 |
3 files changed, 74 insertions, 35 deletions
@@ -1,25 +1,28 @@ pkgbase = r-httpuv pkgdesc = HTTP and WebSocket Server Library pkgver = 1.6.11 - pkgrel = 1 + pkgrel = 2 url = https://cran.r-project.org/package=httpuv - arch = i686 arch = x86_64 license = GPL checkdepends = r-curl checkdepends = r-testthat checkdepends = r-websocket depends = libuv - depends = r-rcpp - depends = r-r6 - depends = r-promises depends = r-later + depends = r-promises + depends = r-r6 + depends = r-rcpp depends = zlib - optdepends = r-testthat optdepends = r-callr optdepends = r-curl + optdepends = r-testthat optdepends = r-websocket source = https://cran.r-project.org/src/contrib/httpuv_1.6.11.tar.gz + source = system-libuv.patch + md5sums = 38ca2017f9a45faa2f45df08de147096 + md5sums = f3a1ba807642c566ae7a47fd33fc9911 sha256sums = 8ba79e0a8351274daf2dc566c71f88e891127cdedca62ad77a4b27a8103eeef5 + sha256sums = 555ba06ceb96fe3d944ae189c07671034db6033b8bad61ce740f6cb44dbac855 pkgname = r-httpuv @@ -1,55 +1,61 @@ # 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=httpuv -_cranver=1.6.11 -pkgname=r-${_cranname,,} -pkgver=${_cranver//[:-]/.} -pkgrel=1 +_pkgname=httpuv +_pkgver=1.6.11 +pkgname=r-${_pkgname,,} +pkgver=${_pkgver//-/.} +pkgrel=2 pkgdesc="HTTP and WebSocket Server Library" -arch=(i686 x86_64) -url="https://cran.r-project.org/package=${_cranname}" +arch=(x86_64) +url="https://cran.r-project.org/package=${_pkgname}" license=(GPL) depends=( - libuv - r-rcpp - r-r6 - r-promises - r-later - zlib + libuv + r-later + r-promises + r-r6 + r-rcpp + zlib +) +checkdepends=( + r-curl + r-testthat + r-websocket ) -checkdepends=(r-curl r-testthat r-websocket) optdepends=( - r-testthat - r-callr - r-curl - r-websocket + r-callr + r-curl + r-testthat + r-websocket ) -source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz") -sha256sums=('8ba79e0a8351274daf2dc566c71f88e891127cdedca62ad77a4b27a8103eeef5') +source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" + "system-libuv.patch") +md5sums=('38ca2017f9a45faa2f45df08de147096' + 'f3a1ba807642c566ae7a47fd33fc9911') +sha256sums=('8ba79e0a8351274daf2dc566c71f88e891127cdedca62ad77a4b27a8103eeef5' + '555ba06ceb96fe3d944ae189c07671034db6033b8bad61ce740f6cb44dbac855') prepare() { - # build against system libuv - sed -i -e 's|PKG_LIBS = ./libuv/.libs/libuv.a|PKG_LIBS = -luv|' \ - -e 's|-Ilibuv/include ||' \ - -e 's|$(SHLIB): libuv/.libs/libuv.a|$(SHLIB):|' \ - "$_cranname/src/Makevars" + # build against system libuv and link to zlib + patch -Np1 -i system-libuv.patch } build() { mkdir -p build - R CMD INSTALL "$_cranname" -l build + R CMD INSTALL "$_pkgname" -l build } check() { - cd "$_cranname/tests" + cd "$_pkgname/tests" R_LIBS="$srcdir/build" LC_TIME=C NOT_CRAN=true Rscript --vanilla testthat.R } package() { install -d "$pkgdir/usr/lib/R/library" - cp -a --no-preserve=ownership "build/$_cranname" "$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/$_cranname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname" + ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/system-libuv.patch b/system-libuv.patch new file mode 100644 index 000000000000..92fcf73ab479 --- /dev/null +++ b/system-libuv.patch @@ -0,0 +1,30 @@ +diff --git a/httpuv/src/Makevars b/httpuv/src/Makevars +index eda5002..0535234 100644 +--- a/httpuv/src/Makevars ++++ b/httpuv/src/Makevars +@@ -1,6 +1,6 @@ + UNAME := $(shell uname) + +-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread ++PKG_LIBS = -luv -lz ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread + + ifeq ($(UNAME), Darwin) + PKG_LIBS += -framework CoreServices +@@ -18,7 +18,7 @@ endif + + PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS + PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS +-PKG_CPPFLAGS = -Ilibuv/include -pthread ++PKG_CPPFLAGS = -pthread + + # To avoid spurious warnings from `R CMD check --as-cran`, about compiler + # warning flags like -Werror. +@@ -38,7 +38,7 @@ CONFIGURE_FLAGS="--quiet" + # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS + + +-$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o ++$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o + + # We needed to rename lt~obsolete.m4 because the name causes problems with R + # CMD check. Here we rename it back. |