Compare commits

..

No commits in common. "rawhide" and "f42" have entirely different histories.

8 changed files with 155 additions and 2669 deletions

1
.gitignore vendored
View file

@ -1,4 +1,3 @@
/websocketpp-0.7.0.tar.gz
/websocketpp-0.8.1.tar.gz
/websocketpp-0.8.2.tar.gz
/websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.tar.gz

View file

@ -1 +1 @@
SHA512 (websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.tar.gz) = 5449a10086c1b80d0d2865bac90539f64613156050816e97a2da1a2bc1f6710ac72305747e839a13e49b2ce1b25610480c110743aef60d7d148f2c39339289c4
SHA512 (websocketpp-0.8.2.tar.gz) = b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06

View file

@ -0,0 +1,12 @@
diff -up websocketpp-0.7.0/CMakeLists.txt.cmake_noarch websocketpp-0.7.0/CMakeLists.txt
--- websocketpp-0.7.0/CMakeLists.txt.cmake_noarch 2016-02-22 07:30:10.000000000 -0600
+++ websocketpp-0.7.0/CMakeLists.txt 2016-09-15 13:05:59.012179625 -0500
@@ -19,7 +19,7 @@ set(INSTALL_INCLUDE_DIR include CACHE PA
if (WIN32 AND NOT CYGWIN)
set (DEF_INSTALL_CMAKE_DIR cmake)
else ()
- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
+ set (DEF_INSTALL_CMAKE_DIR share/cmake/websocketpp)
endif ()
set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,106 @@
From 3197a520eb4c1e4754860441918a5930160373eb Mon Sep 17 00:00:00 2001
From: Peter Thorson <git@zaphoyd.com>
Date: Tue, 29 Jun 2021 09:13:12 -0500
Subject: [PATCH] [core] Remove the use of simple template ids as they have
been removed in c++20.
https://timsong-cpp.github.io/cppwp/n4861/diff.cpp17.class#2 references #991
---
websocketpp/endpoint.hpp | 2 +-
websocketpp/logger/basic.hpp | 14 +++++++-------
websocketpp/roles/server_endpoint.hpp | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp
index 825eaa46d..10f525689 100644
--- a/websocketpp/endpoint.hpp
+++ b/websocketpp/endpoint.hpp
@@ -111,7 +111,7 @@ class endpoint : public config::transport_type, public config::endpoint_base {
/// Destructor
- ~endpoint<connection,config>() {}
+ ~endpoint() {}
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no copy constructor because endpoints are not copyable
diff --git a/websocketpp/logger/basic.hpp b/websocketpp/logger/basic.hpp
index 84514130e..4c9d83649 100644
--- a/websocketpp/logger/basic.hpp
+++ b/websocketpp/logger/basic.hpp
@@ -58,33 +58,33 @@ namespace log {
template <typename concurrency, typename names>
class basic {
public:
- basic<concurrency,names>(channel_type_hint::value h =
+ basic(channel_type_hint::value h =
channel_type_hint::access)
: m_static_channels(0xffffffff)
, m_dynamic_channels(0)
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
- basic<concurrency,names>(std::ostream * out)
+ basic(std::ostream * out)
: m_static_channels(0xffffffff)
, m_dynamic_channels(0)
, m_out(out) {}
- basic<concurrency,names>(level c, channel_type_hint::value h =
+ basic(level c, channel_type_hint::value h =
channel_type_hint::access)
: m_static_channels(c)
, m_dynamic_channels(0)
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
- basic<concurrency,names>(level c, std::ostream * out)
+ basic(level c, std::ostream * out)
: m_static_channels(c)
, m_dynamic_channels(0)
, m_out(out) {}
/// Destructor
- ~basic<concurrency,names>() {}
+ ~basic() {}
/// Copy constructor
- basic<concurrency,names>(basic<concurrency,names> const & other)
+ basic(basic<concurrency,names> const & other)
: m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out)
@@ -97,7 +97,7 @@ class basic {
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
/// Move constructor
- basic<concurrency,names>(basic<concurrency,names> && other)
+ basic(basic<concurrency,names> && other)
: m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out)
diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp
index 4a5865eff..04fee18f9 100644
--- a/websocketpp/roles/server_endpoint.hpp
+++ b/websocketpp/roles/server_endpoint.hpp
@@ -75,11 +75,11 @@ class server : public endpoint<connection<config>,config> {
}
/// Destructor
- ~server<config>() {}
+ ~server() {}
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no copy constructor because endpoints are not copyable
- server<config>(server<config> &) = delete;
+ server(server<config> &) = delete;
// no copy assignment operator because endpoints are not copyable
server<config> & operator=(server<config> const &) = delete;
@@ -87,7 +87,7 @@ class server : public endpoint<connection<config>,config> {
#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
/// Move constructor
- server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
+ server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no move assignment operator because of const member variables

View file

@ -0,0 +1,23 @@
From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 8 Jan 2020 17:59:48 +0100
Subject: [PATCH] Fix cmake find boost with version >= 1.71
For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d13117ba..9a46bc10c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
set (Boost_USE_MULTITHREADED TRUE)
set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
+ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
if (Boost_FOUND)
# Boost is a project wide global dependency.

View file

@ -1,11 +0,0 @@
--- a/CMakeLists.txt 2022-05-24 17:42:50.000000000 +0200
+++ b/CMakeLists.txt 2026-01-27 20:15:14.456352600 +0100
@@ -45,7 +45,7 @@ set(INSTALL_INCLUDE_DIR include CACHE PA
if (WIN32 AND NOT CYGWIN)
set (DEF_INSTALL_CMAKE_DIR cmake)
else ()
- set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp)
+ set (DEF_INSTALL_CMAKE_DIR share/cmake/websocketpp)
endif ()
set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")

View file

@ -1,26 +1,18 @@
%global basever 0.8.2
%global commit b9aeec6eaf3d5610503439b4fae3581d9aff08e8
%global shortcommit %{sub %{commit} 1 7}
%global snapdate 20220525
Name: websocketpp
Summary: C++ WebSocket Protocol Library
Version: %{basever}%{?snapdate:^git%{snapdate}.%{shortcommit}}
Release: 3%{?dist}
Version: 0.8.2
Release: 17%{?dist}
# Automatically converted from old format: BSD - review is highly recommended.
License: LicenseRef-Callaway-BSD
Url: https://www.zaphoyd.com/websocketpp
%if %{defined snapdate}
Source0: https://github.com/zaphoyd/websocketpp/archive/%{commit}/%{name}-%{commit}.tar.gz
%else
Source0: https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
%endif
Source1: websocketpp.pc
BuildArch: noarch
# put cmake files in share/cmake instead of lib/cmake
Patch1: websocketpp-0.8.3-cmake_noarch.patch
Patch1: websocketpp-0.7.0-cmake_noarch.patch
# Switch from ExactVersion to AnyNewerVersion to improve compatibility
# https://cmake.org/cmake/help/v3.0/module/CMakePackageConfigHelpers.html
@ -33,16 +25,22 @@ Patch2: websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patc
# Disable the following tests, which fail occasionally: test_transport, test_transport_asio_timers
Patch3: websocketpp-0.7.0-disable-test_transport-test_transport_asio_timers.patch
# Compatibility fixes for Boost 1.87
# https://github.com/zaphoyd/websocketpp/pull/1164
# Patch from PR at commit ee8cf42, 2025-04-09
Patch4: websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch
# Fix cmake find boost
# https://github.com/zaphoyd/websocketpp/pull/855
# https://github.com/zaphoyd/websocketpp/commit/3590d77
Patch4: websocketpp-0.8.2-fix-cmake-find-boost.patch
# fix c++20 build error
# https://github.com/zaphoyd/websocketpp/issues/991
# https://github.com/zaphoyd/websocketpp/commit/3197a520eb4c1e4754860441918a5930160373eb
Patch5: websocketpp-0.8.2-cpp20-fixes.patch
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: gcc-c++
# needed for tests mostly
BuildRequires: pkgconfig(openssl)
BuildRequires: openssl-devel-engine
BuildRequires: zlib-devel
%description
@ -64,11 +62,7 @@ iostreams and one based on Boost Asio.
%prep
%if %{defined snapdate}
%autosetup -p1 -n %{name}-%{commit}
%else
%autosetup -p1
%endif
%build
@ -99,33 +93,6 @@ rm -rfv %{buildroot}%{_includedir}/test_connection/
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2^git20220525.b9aeec6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 0.8.2^git20220525.b9aeec6-2
- Rebuilt for openssl 4.0
* Tue Jan 27 2026 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2^git20220525.b9aeec6-1
- Update to post-release git snapshot on 0.8.2
- Add patch:
websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch, which
fixes FTBFS with Boost 1.90
- Update cmake_noarch patch
- Drop patches:
websocketpp-0.8.2-fix-cmake-find-boost.patch
websocketpp-0.8.2-cpp20-fixes.patch
websocketpp-0.8.2-cmake40.patch
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 18 2025 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-18
- Add patch: websocketpp-0.8.2-cmake40.patch
- Fix CMake 4.0 FTBFS #2381633
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild