commit: f51e8ea15c7e91d752fb5b2f96c5753ea9ef540c Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Wed Feb 4 15:37:03 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 5 22:54:12 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51e8ea1
dev-cpp/websocketpp: fix boost_1.89 Closes: https://bugs.gentoo.org/969568 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45639 Closes: https://github.com/gentoo/gentoo/pull/45639 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/websocketpp-0.8.2-fix-boost1.89.patch | 54 ++++++++++++++++++++++ ...ebsocketpp-0.8.2-fix-boost_find_component.patch | 24 ---------- dev-cpp/websocketpp/websocketpp-0.8.2-r1.ebuild | 6 +-- 3 files changed, 57 insertions(+), 27 deletions(-) diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost1.89.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost1.89.patch new file mode 100644 index 000000000000..62c1aa8e250f --- /dev/null +++ b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost1.89.patch @@ -0,0 +1,54 @@ +See PR pending https://github.com/zaphoyd/websocketpp/pull/1189.patch +fix boost_1.89 bug #969568 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,7 +112,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + + # Visual studio + if (MSVC) +- set (WEBSOCKETPP_BOOST_LIBS system thread) ++ set (WEBSOCKETPP_BOOST_LIBS thread) + set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /GF /Ox /Ob2 /Ot /Oi /MP /arch:SSE2 /fp:fast") + set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF") + add_definitions (/W3 /wd4996 /wd4995 /wd4355) +@@ -129,7 +129,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + set (WEBSOCKETPP_PLATFORM_LIBS pthread) + endif() + set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) +- set (WEBSOCKETPP_BOOST_LIBS system thread) ++ set (WEBSOCKETPP_BOOST_LIBS thread) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + if (NOT APPLE) + add_definitions (-DNDEBUG -Wall -Wcast-align) # todo: should we use CMAKE_C_FLAGS for these? +@@ -139,7 +139,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + execute_process (COMMAND ${CMAKE_CXX_COMPILER} "-dumpversion" OUTPUT_VARIABLE GCC_VERSION) + if ("${GCC_VERSION}" STRGREATER "4.4.0") + message("* C++11 support partially enabled due to GCC version ${GCC_VERSION}") +- set (WEBSOCKETPP_BOOST_LIBS system thread) ++ set (WEBSOCKETPP_BOOST_LIBS thread) + endif () + endif () + +@@ -151,7 +151,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + set (WEBSOCKETPP_PLATFORM_LIBS pthread) + endif() + set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) +- set (WEBSOCKETPP_BOOST_LIBS system thread) ++ set (WEBSOCKETPP_BOOST_LIBS thread) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + if (NOT APPLE) + add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? +@@ -213,9 +213,8 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + set (Boost_FIND_QUIETLY TRUE) + set (Boost_DEBUG FALSE) + 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.69.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. +-- +2.52.0 + diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch deleted file mode 100644 index 28f4361f35c1..000000000000 --- a/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 36b73da8958927f975b3d01a062aa6c0e149d97f Mon Sep 17 00:00:00 2001 -From: Peter Thorson <[email protected]> -Date: Mon, 27 Apr 2020 10:34:06 -0500 -Subject: [PATCH] [cmake] Remove quotes that was making it hard for cmake to - find newer boost versions. fixes #855 - ---- - CMakeLists.txt | 2 +- - changelog.md | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e9c80e84..ffcd8583b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -215,7 +215,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. diff --git a/dev-cpp/websocketpp/websocketpp-0.8.2-r1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.2-r1.ebuild index 471fcd07c69e..e11e2f56224e 100644 --- a/dev-cpp/websocketpp/websocketpp-0.8.2-r1.ebuild +++ b/dev-cpp/websocketpp/websocketpp-0.8.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,8 +26,6 @@ PATCHES=( # disable tests that are timing sensitive # https://bugzilla.redhat.com/show_bug.cgi?id=1461069 "${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch - # https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f - "${FILESDIR}"/${P}-fix-boost_find_component.patch # https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74 "${FILESDIR}"/${P}-fix-clang.patch # C++20 support from https://github.com/zaphoyd/websocketpp/commit/3197a520eb4c1e4754860441918a5930160373eb @@ -37,6 +35,8 @@ PATCHES=( "${WORKDIR}/${P}-boost-1.87-compat.patch" # https://github.com/zaphoyd/websocketpp/commit/deb0a334471362608958ce59a6b0bcd3e5b73c24 "${FILESDIR}/${P}-cmake4.patch" # bug 953936 + # PR pending https://github.com/zaphoyd/websocketpp/pull/1189.patch + "${FILESDIR}"/${P}-fix-boost1.89.patch ) src_configure() {
