[lilac] updated to 1.6.12-1

4 files changed, 31 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59eb37e8ec2f..65924da9fa77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-httpuv
 	pkgdesc = HTTP and WebSocket Server Library
-	pkgver = 1.6.11
-	pkgrel = 2
+	pkgver = 1.6.12
+	pkgrel = 1
 	url = https://cran.r-project.org/package=httpuv
 	arch = x86_64
 	license = GPL
@@ -18,11 +18,11 @@ pkgbase = r-httpuv
 	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
+	source = https://cran.r-project.org/src/contrib/httpuv_1.6.12.tar.gz
+	source = link-zlib.patch
+	md5sums = fe7156e4f6a61906d3258aa0cfea94dd
+	md5sums = b2a2549bfef0d3a442b6ed545fc2f1f9
+	sha256sums = b1d972b1c240702c38cb844a1040670d62876abf462256764b49c120a52f5e74
+	sha256sums = 95c708ea54de715494bcb43d40973296fb2ee8fb066fb582bfc69cdaf5d4e667
 
 pkgname = r-httpuv
diff --git a/PKGBUILD b/PKGBUILD
index 14e63de40e63..bec466ab5364 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _pkgname=httpuv
-_pkgver=1.6.11
+_pkgver=1.6.12
 pkgname=r-${_pkgname,,}
 pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="HTTP and WebSocket Server Library"
 arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
@@ -31,20 +31,21 @@ optdepends=(
   r-websocket
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
-        "system-libuv.patch")
-md5sums=('38ca2017f9a45faa2f45df08de147096'
-         'f3a1ba807642c566ae7a47fd33fc9911')
-sha256sums=('8ba79e0a8351274daf2dc566c71f88e891127cdedca62ad77a4b27a8103eeef5'
-            '555ba06ceb96fe3d944ae189c07671034db6033b8bad61ce740f6cb44dbac855')
+        "link-zlib.patch")
+md5sums=('fe7156e4f6a61906d3258aa0cfea94dd'
+         'b2a2549bfef0d3a442b6ed545fc2f1f9')
+sha256sums=('b1d972b1c240702c38cb844a1040670d62876abf462256764b49c120a52f5e74'
+            '95c708ea54de715494bcb43d40973296fb2ee8fb066fb582bfc69cdaf5d4e667')
 
 prepare() {
-  # build against system libuv and link to zlib
-  patch -Np1 -i system-libuv.patch
+  # link to zlib
+  patch -Np1 -i link-zlib.patch
 }
 
 build() {
   mkdir -p build
-  R CMD INSTALL "$_pkgname" -l build
+  R CMD INSTALL "$_pkgname" -l build \
+      --configure-vars=USE_BUNDLED_LIBUV=false
 }
 
 check() {
diff --git a/link-zlib.patch b/link-zlib.patch
new file mode 100644
index 000000000000..941d51217bb4
--- /dev/null
+++ b/link-zlib.patch
@@ -0,0 +1,12 @@
+diff --git a/httpuv/src/Makevars.in b/httpuv/src/Makevars.in
+index f3b1af0..e000e1f 100644
+--- a/httpuv/src/Makevars.in
++++ b/httpuv/src/Makevars.in
+@@ -1,6 +1,6 @@
+ UNAME := $(shell uname)
+ 
+-PKG_LIBS = @libs@ ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
++PKG_LIBS = @libs@ -lz ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
+ 
+ ifeq ($(UNAME), Darwin)
+ PKG_LIBS += -framework CoreServices
diff --git a/system-libuv.patch b/system-libuv.patch
deleted file mode 100644
index 92fcf73ab479..000000000000
--- a/system-libuv.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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.