diff --git a/.gitignore b/.gitignore index b56bdf4..6e66716 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /httpuv_1.4.4.1.tar.gz /httpuv_1.4.5.tar.gz /httpuv_1.4.5.1.tar.gz +/httpuv_1.5.0.tar.gz diff --git a/0001-Use-unbundled-libuv.patch b/0001-Use-unbundled-libuv.patch index 87406c0..15ec604 100644 --- a/0001-Use-unbundled-libuv.patch +++ b/0001-Use-unbundled-libuv.patch @@ -1,4 +1,4 @@ -From 352cd588d3405f1ec70a2b78210458ab6b1ca565 Mon Sep 17 00:00:00 2001 +From 9a9c4055559e27c95fcb0119de091ab437197cba Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 30 Apr 2018 04:53:42 -0400 Subject: [PATCH] Use unbundled libuv. @@ -20,7 +20,7 @@ Signed-off-by: Elliott Sales de Andrade 12 files changed, 14 insertions(+), 45 deletions(-) diff --git a/src/Makevars b/src/Makevars -index ce14b4d..1017d92 100644 +index 275a1b7..f940ce9 100644 --- a/src/Makevars +++ b/src/Makevars @@ -9,7 +9,7 @@ ifeq ($(UNAME), Darwin) @@ -34,9 +34,9 @@ index ce14b4d..1017d92 100644 endif @@ -22,7 +22,7 @@ endif - PKG_CFLAGS = $(C_VISIBILITY) - PKG_CXXFLAGS = $(CXX_VISIBILITY) --PKG_CPPFLAGS = -pthread + PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS + PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS +-PKG_CPPFLAGS = -Ilibuv/include -pthread +PKG_CPPFLAGS = -pthread $(shell pkgconf --cflags libuv) # To avoid spurious warnings from `R CMD check --as-cran`, about compiler @@ -118,7 +118,7 @@ index 41a1291..0ea3578 100644 #include #include "webapplication.h" diff --git a/src/httprequest.h b/src/httprequest.h -index b767065..e09ec6b 100644 +index 6865373..fb9a041 100644 --- a/src/httprequest.h +++ b/src/httprequest.h @@ -8,7 +8,7 @@ @@ -131,7 +131,7 @@ index b767065..e09ec6b 100644 #include "socket.h" #include "webapplication.h" diff --git a/src/httpresponse.cpp b/src/httpresponse.cpp -index e41e9a3..32d9ce9 100644 +index be807c7..0f7ce1a 100644 --- a/src/httpresponse.cpp +++ b/src/httpresponse.cpp @@ -3,7 +3,7 @@ @@ -144,7 +144,7 @@ index e41e9a3..32d9ce9 100644 void on_response_written(uv_write_t* handle, int status) { diff --git a/src/httpuv.cpp b/src/httpuv.cpp -index 07053d5..e05cc94 100644 +index 6e6eac4..4d6eac2 100644 --- a/src/httpuv.cpp +++ b/src/httpuv.cpp @@ -7,7 +7,7 @@ @@ -196,20 +196,20 @@ index e9066cb..80ea8b1 100644 // These must be called from the main and background thread, respectively, so // that is_main_thread() and is_background_thread() can be tested later. diff --git a/src/uvutil.h b/src/uvutil.h -index 0381bd4..e1089b9 100644 +index 48c849a..5d82aaf 100644 --- a/src/uvutil.h +++ b/src/uvutil.h -@@ -4,7 +4,7 @@ - #include "thread.h" +@@ -5,7 +5,7 @@ #include #include + #include -#include "libuv/include/uv.h" +#include - /* Prevent naming conflicts for Free() and Calloc() */ - #define R_NO_REMAP + #include + diff --git a/src/webapplication.h b/src/webapplication.h -index b45b0bc..683870b 100644 +index bc23646..f3ee5f1 100644 --- a/src/webapplication.h +++ b/src/webapplication.h @@ -2,7 +2,7 @@ diff --git a/R-httpuv.spec b/R-httpuv.spec index 3d66569..d570bdd 100644 --- a/R-httpuv.spec +++ b/R-httpuv.spec @@ -2,7 +2,7 @@ %global rlibdir %{_libdir}/R/library Name: R-%{packname} -Version: 1.4.5.1 +Version: 1.5.0 Release: 1%{?dist} Summary: HTTP and WebSocket Server Library @@ -13,26 +13,27 @@ Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}. Patch0001: 0001-Use-unbundled-libuv.patch # Here's the R view of the dependencies world: -# Depends: R-methods -# Imports: R-Rcpp >= 0.11.0, R-utils, R-promises, R-later >= 0.7.3 -# Suggests: R-testthat, R-callr +# Depends: +# Imports: R-Rcpp >= 0.11.0, R-utils, R-R6, R-promises, R-later >= 0.8.0 +# Suggests: R-testthat, R-callr, R-curl # LinkingTo: # Enhances: -Requires: R-methods Requires: R-Rcpp >= 0.11.0 Requires: R-utils +Requires: R-R6 Requires: R-promises -Requires: R-later >= 0.7.3 +Requires: R-later >= 0.8.0 BuildRequires: R-devel BuildRequires: tex(latex) -BuildRequires: R-methods BuildRequires: R-Rcpp-devel >= 0.11.0 BuildRequires: R-utils +BuildRequires: R-R6 BuildRequires: R-promises -BuildRequires: R-later-devel >= 0.7.3 +BuildRequires: R-later-devel >= 0.8.0 BuildRequires: R-testthat BuildRequires: R-callr +BuildRequires: R-curl BuildRequires: R-BH-devel # Hopefully will be removable in the later releases, but for now it includes # some patches: @@ -90,6 +91,9 @@ rm -f %{buildroot}%{rlibdir}/R.css %changelog +* Sun Mar 17 2019 Elliott Sales de Andrade - 1.5.0-1 +- Update to latest version + * Thu Feb 21 2019 Elliott Sales de Andrade - 1.4.5.1-1 - Update to latest version diff --git a/sources b/sources index 22ee57c..0f6e585 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpuv_1.4.5.1.tar.gz) = ca70cb28939928f51fd57d6b2df9308efcbd98b930768924310f5e7cac851c7338a3c19706d81978cdf4aec5046c1b90bda5e04d2d0460b9948c34f03040e47c +SHA512 (httpuv_1.5.0.tar.gz) = c2034720c7df5e77b3e768f3fa38d765b34bfbacbba3fef10d812b46a35f26b2b4d74fa08d4136fcd4a7b16b60635152ad3477c6487e9debb867aaad584776c2