[gentoo-commits] repo/proj/guru:master commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/

[gentoo-commits] repo/proj/guru:master commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/

[Florian Schmaus]

commit:     1ff1e0590d5f72f58e800d32b321cb43f071fd62
Author:     Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Fri Apr 29 07:20:17 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:20:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1ff1e059

net-libs/ixwebsocket: add 11.4.2, drop 11.4.1

Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>

 net-libs/ixwebsocket/Manifest                                           | 2 +-
 ...etwork-tests.patch => ixwebsocket-11.4.2-remove-network-tests.patch} | 0
 ...e-system-spdlog.patch => ixwebsocket-11.4.2-use-system-spdlog.patch} | 0
 .../{ixwebsocket-11.4.1.ebuild => ixwebsocket-11.4.2.ebuild}            | 0
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
index 28b53dab2..a9658fa9f 100644
--- a/net-libs/ixwebsocket/Manifest
+++ b/net-libs/ixwebsocket/Manifest
@@ -1,2 +1,2 @@
 DIST ixwebsocket-11.3.3.tar.gz 631670 BLAKE2B 77e88fd107b5670ff70ff06e1cb6c32145ce709008fc2c51abf7c05d0b5f6e02524846261a5b3252b1e5d95e55545aa8a3d9ae663675f91ead709bf133e48d3e SHA512 3831794450bd9e5c08251301afae83ed0ffdb5d1d2e1db40d02d09545e0a78f8ea9d637210181211dff113b78dbb9a4ebaa26faef28f8f65a340321067fa3a8f
-DIST ixwebsocket-11.4.1.tar.gz 631397 BLAKE2B c5be5cc5684b69b9a71577db33550cb5512ea7b7965da7a31d1680ae1c2c711db42b442ed99ff57e5f87dd3fa299e4ac2dc184f41af92616dd142444d4bf7827 SHA512 73204d86b876ab739263525312bc473b4f4f9d15b96e6a5c511b58dc13bb0d99c083a83c31ecb08be15eb6b413ad0cf6434ef3b7af8d29e559079705a609f119
+DIST ixwebsocket-11.4.2.tar.gz 631385 BLAKE2B 1f6cff44263548d8bb0be9308ec75aaccef93a4e0ef83d8c647fbc5567b8b9b85f0d91414907905fc4e9ebcfb3eb62fd71241888ffa25fbea1adda93c50f4be2 SHA512 7a7d2207986007ad0f09f98dec4f6e8fa61c73b8189b47f931b43a49779a55e55669e882763f78b2f5ab805b6adcb254f09c16efd8280f0d32db7d7e71dbb426

diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.2-remove-network-tests.patch
similarity index 100%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.4.1-remove-network-tests.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.4.2-remove-network-tests.patch

diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.2-use-system-spdlog.patch
similarity index 100%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.4.1-use-system-spdlog.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.4.2-use-system-spdlog.patch

diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.1.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.2.ebuild
similarity index 100%
rename from net-libs/ixwebsocket/ixwebsocket-11.4.1.ebuild
rename to net-libs/ixwebsocket/ixwebsocket-11.4.2.ebuild

[gentoo-commits] repo/proj/guru:master commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/

[Julien Roy]

commit:     2dd8789f46357123b4f0b026e7d23030b2509cdd
Author:     Xin Yang <yangmame <AT> icloud <DOT> com>
AuthorDate: Fri Feb 23 01:09:00 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Fri Feb 23 14:15:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2dd8789f

net-libs/ixwebsocket: add fix server empty thread name patch

Signed-off-by: Xin Yang <yangmame <AT> icloud.com>
Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>

 ...ocket-11.4.4-fix-server-empty-thread-name.patch | 82 ++++++++++++++++++++++
 net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild     |  2 +
 2 files changed, 84 insertions(+)

diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch
new file mode 100644
index 0000000000..af062b3b93
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch
@@ -0,0 +1,82 @@
+From a7019631b765581b7e3549cf7cdac77496984709 Mon Sep 17 00:00:00 2001
+From: lanthora <lanthora@outlook.com>
+Date: Wed, 2 Aug 2023 13:16:43 +0800
+Subject: [PATCH] Fix server empty thread name (#478)
+
+---
+ ixwebsocket/IXWebSocket.cpp       | 11 ++++++++++-
+ ixwebsocket/IXWebSocket.h         |  5 +++++
+ ixwebsocket/IXWebSocketServer.cpp |  3 +++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/ixwebsocket/IXWebSocket.cpp b/ixwebsocket/IXWebSocket.cpp
+index 1a879a78..b74426ef 100644
+--- a/ixwebsocket/IXWebSocket.cpp
++++ b/ixwebsocket/IXWebSocket.cpp
+@@ -41,6 +41,7 @@ namespace ix
+         , _enablePong(kDefaultEnablePong)
+         , _pingIntervalSecs(kDefaultPingIntervalSecs)
+         , _pingType(SendMessageKind::Ping)
++        , _autoThreadName(true)
+     {
+         _ws.setOnCloseCallback(
+             [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote)
+@@ -370,7 +371,10 @@ namespace ix
+ 
+     void WebSocket::run()
+     {
+-        setThreadName(getUrl());
++        if (_autoThreadName)
++        {
++            setThreadName(getUrl());
++        }
+ 
+         bool firstConnectionAttempt = true;
+ 
+@@ -627,4 +631,9 @@ namespace ix
+         std::lock_guard<std::mutex> lock(_configMutex);
+         return _subProtocols;
+     }
++
++    void WebSocket::setAutoThreadName(bool enabled)
++    {
++        _autoThreadName = enabled;
++    }
+ } // namespace ix
+diff --git a/ixwebsocket/IXWebSocket.h b/ixwebsocket/IXWebSocket.h
+index 7adfe166..21292e7d 100644
+--- a/ixwebsocket/IXWebSocket.h
++++ b/ixwebsocket/IXWebSocket.h
+@@ -119,6 +119,8 @@ namespace ix
+         uint32_t getMinWaitBetweenReconnectionRetries() const;
+         const std::vector<std::string>& getSubProtocols();
+ 
++        void setAutoThreadName(bool enabled);
++
+     private:
+         WebSocketSendInfo sendMessage(const IXWebSocketSendData& message,
+                                       SendMessageKind sendMessageKind,
+@@ -182,6 +184,9 @@ namespace ix
+         // Subprotocols
+         std::vector<std::string> _subProtocols;
+ 
++        // enable or disable auto set thread name
++        bool _autoThreadName;
++
+         friend class WebSocketServer;
+     };
+ } // namespace ix
+diff --git a/ixwebsocket/IXWebSocketServer.cpp b/ixwebsocket/IXWebSocketServer.cpp
+index 03b0ea50..4518389b 100644
+--- a/ixwebsocket/IXWebSocketServer.cpp
++++ b/ixwebsocket/IXWebSocketServer.cpp
+@@ -91,6 +91,9 @@ namespace ix
+         setThreadName("Srv:ws:" + connectionState->getId());
+ 
+         auto webSocket = std::make_shared<WebSocket>();
++
++        webSocket->setAutoThreadName(false);
++
+         if (_onConnectionCallback)
+         {
+             _onConnectionCallback(webSocket, connectionState);

diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
index ab45a5ac9c..2f852a9479 100644
--- a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
+++ b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
@@ -49,6 +49,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-remove-network-tests.patch"
 	# Upstream uses git submodules
 	"${FILESDIR}/${P}-use-system-spdlog.patch"
+	# Fix Server empty thread name
+	"${FILESDIR}/${P}-fix-server-empty-thread-name.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/proj/guru:master commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/

[Florian Schmaus]

commit:     2007a67242ba3c04cdbda0f3795857449c4d76b0
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Dec 28 13:21:12 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 13:21:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2007a672

net-libs/ixwebsocket: fix build with GCC 15

Closes: https://bugs.gentoo.org/937500
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 .../ixwebsocket/files/ixwebsocket-11.4.4-fix-gcc15.patch     | 12 ++++++++++++
 net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild               |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-gcc15.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-gcc15.patch
new file mode 100644
index 000000000..4b504e1aa
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-gcc15.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/937500
+https://github.com/machinezone/IXWebSocket/pull/538
+Fix build with GCC 15.
+--- a/third_party/msgpack11/msgpack11.hpp
++++ b/third_party/msgpack11/msgpack11.hpp
+@@ -1,5 +1,6 @@
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include <map>

diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
index d0675734a..e1f3d8e05 100644
--- a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
+++ b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,6 +49,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-use-system-spdlog.patch"
 	# Fix Server empty thread name
 	"${FILESDIR}/${P}-fix-server-empty-thread-name.patch"
+	# Fix build with GCC 15
+	"${FILESDIR}/${P}-fix-gcc15.patch"
 )
 
 src_configure() {