[packages/nghttp2] - updated to 1.39.1 - removed obsolete boost-1.70 patch

qboosh qboosh at pld-linux.org
Fri Jul 19 18:37:54 CEST 2019


commit b17c3c9faba87d536371f7f18e5e5a49464a84de
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 19 18:39:44 2019 +0200

    - updated to 1.39.1
    - removed obsolete boost-1.70 patch

 nghttp2-boost-1.70.patch | 33 ---------------------------------
 nghttp2.spec             | 10 ++++------
 2 files changed, 4 insertions(+), 39 deletions(-)
---
diff --git a/nghttp2.spec b/nghttp2.spec
index e632a68..142cc97 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -8,16 +8,15 @@
 Summary:	HTTP/2.0 C library
 Summary(pl.UTF-8):	Biblioteka C HTTP/2.0
 Name:		nghttp2
-Version:	1.38.0
+Version:	1.39.1
 Release:	1
 License:	MIT
 Group:		Libraries
 #Source0Download: https://github.com/nghttp2/nghttp2/releases
 Source0:	https://github.com/nghttp2/nghttp2/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	45b47086ee6da8171e11887c1665f275
+# Source0-md5:	02b015cb178c46f27dd87228e33db35f
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-python.patch
-Patch2:		%{name}-boost-1.70.patch
 URL:		https://nghttp2.org/
 %{?with_tests:BuildRequires:	CUnit >= 2.1}
 BuildRequires:	autoconf >= 2.61
@@ -28,7 +27,7 @@ BuildRequires:	jansson-devel >= 2.5
 BuildRequires:	libev-devel
 # for examples
 BuildRequires:	libevent-devel >= 2.0.8
-BuildRequires:	libstdc++-devel >= 6:4.3
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libxml2-devel >= 1:2.6.26
 BuildRequires:	openssl-devel >= 1.0.1
@@ -132,7 +131,7 @@ Summary(pl.UTF-8):	Plik nagłówkowy biblioteki nghttp2_asio
 Group:		Development/Libraries
 Requires:	%{name}-asio = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	libstdc++-devel
+Requires:	libstdc++-devel >= 6:4.7
 
 %description asio-devel
 Header file for nghttp2_asio library.
@@ -156,7 +155,6 @@ Statyczna biblioteka libnghttp2_asio.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' script/fetch-ocsp-response
 
diff --git a/nghttp2-boost-1.70.patch b/nghttp2-boost-1.70.patch
deleted file mode 100644
index b1624be..0000000
--- a/nghttp2-boost-1.70.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- nghttp2-1.37.0/src/asio_server_connection.h~	2019-04-18 08:06:45.000000000 +0200
-+++ nghttp2-1.37.0/src/asio_server_connection.h	2019-04-18 10:41:33.966806171 +0200
-@@ -51,6 +51,12 @@
- #include "util.h"
- #include "template.h"
- 
-+#if BOOST_VERSION >= 107000
-+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
-+#else
-+#define GET_IO_SERVICE(s) ((s).get_io_service())
-+#endif
-+
- namespace nghttp2 {
- 
- namespace asio_http2 {
-@@ -71,7 +77,7 @@
-       SocketArgs &&... args)
-       : socket_(std::forward<SocketArgs>(args)...),
-         mux_(mux),
--        deadline_(socket_.get_io_service()),
-+        deadline_(GET_IO_SERVICE(socket_)),
-         tls_handshake_timeout_(tls_handshake_timeout),
-         read_timeout_(read_timeout),
-         writing_(false),
-@@ -82,7 +88,7 @@
-     boost::system::error_code ec;
- 
-     handler_ = std::make_shared<http2_handler>(
--        socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec),
-+        GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec),
-         [this]() { do_write(); }, mux_);
-     if (handler_->start() != 0) {
-       stop();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nghttp2.git/commitdiff/b17c3c9faba87d536371f7f18e5e5a49464a84de



More information about the pld-cvs-commit mailing list