Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2019-02-21 02:19:08 -05:00
parent f8a54181f5
commit e6ff69959c
4 changed files with 17 additions and 13 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/httpuv_1.4.3.tar.gz
/httpuv_1.4.4.1.tar.gz
/httpuv_1.4.5.tar.gz
/httpuv_1.4.5.1.tar.gz

View File

@ -1,4 +1,4 @@
From 305abffcb8a640e8c94af1090c12b2259126d2dd Mon Sep 17 00:00:00 2001
From 352cd588d3405f1ec70a2b78210458ab6b1ca565 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
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 <quantum.analyst@gmail.com>
12 files changed, 14 insertions(+), 45 deletions(-)
diff --git a/src/Makevars b/src/Makevars
index 7b22000..46d4ad1 100644
index ce14b4d..1017d92 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -9,7 +9,7 @@ ifeq ($(UNAME), Darwin)
@ -32,16 +32,16 @@ index 7b22000..46d4ad1 100644
ifeq ($(UNAME), SunOS)
PKG_LIBS += -lkstat -lsendfile -lsocket -lxnet
endif
@@ -20,7 +20,7 @@ ifeq ($(UNAME), OpenBSD)
PKG_LIBS += -lkvm
endif
@@ -22,7 +22,7 @@ endif
-PKG_CPPFLAGS = $(C_VISIBILITY) -pthread
+PKG_CPPFLAGS = $(C_VISIBILITY) -pthread $(shell pkgconf --cflags libuv)
PKG_CFLAGS = $(C_VISIBILITY)
PKG_CXXFLAGS = $(CXX_VISIBILITY)
-PKG_CPPFLAGS = -pthread
+PKG_CPPFLAGS = -pthread $(shell pkgconf --cflags libuv)
# To avoid spurious warnings from `R CMD check --as-cran`, about compiler
# warning flags like -Werror.
@@ -42,35 +42,4 @@ CONFIGURE_FLAGS="--quiet"
@@ -44,35 +44,4 @@ CONFIGURE_FLAGS="--quiet"
# PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS
@ -118,7 +118,7 @@ index 41a1291..0ea3578 100644
#include <boost/bind.hpp>
#include "webapplication.h"
diff --git a/src/httprequest.h b/src/httprequest.h
index 66de583..e0c7c71 100644
index b767065..e09ec6b 100644
--- a/src/httprequest.h
+++ b/src/httprequest.h
@@ -8,7 +8,7 @@
@ -222,5 +222,5 @@ index b45b0bc..683870b 100644
#include "websockets.h"
#include "thread.h"
--
2.17.1
2.20.1

View File

@ -2,8 +2,8 @@
%global rlibdir %{_libdir}/R/library
Name: R-%{packname}
Version: 1.4.5
Release: 2%{?dist}
Version: 1.4.5.1
Release: 1%{?dist}
Summary: HTTP and WebSocket Server Library
# Main: GPLv2+; http-parser: MIT; sha1: Public Domain
@ -90,6 +90,9 @@ rm -f %{buildroot}%{rlibdir}/R.css
%changelog
* Thu Feb 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.5.1-1
- Update to latest version
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (httpuv_1.4.5.tar.gz) = 2c793b15c8ff3a5e6bf6115e84058d9cac3357e74fe70a111cef7788d617bc3c9d8796634871a364cb5648f294ae0cad94fae61eb1d2764a854e818b59f7000d
SHA512 (httpuv_1.4.5.1.tar.gz) = ca70cb28939928f51fd57d6b2df9308efcbd98b930768924310f5e7cac851c7338a3c19706d81978cdf4aec5046c1b90bda5e04d2d0460b9948c34f03040e47c