<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3c0c77283cf3a91b7c6baac7b7a1a681ba397d31">https://github.com/macports/macports-ports/commit/3c0c77283cf3a91b7c6baac7b7a1a681ba397d31</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3c0c77283cf ixwebsocket: fix for < 10.6
</span>3c0c77283cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3c0c77283cf3a91b7c6baac7b7a1a681ba397d31
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Apr 22 16:59:24 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> ixwebsocket: fix for < 10.6
</span>---
net/ixwebsocket/Portfile | 2 +
net/ixwebsocket/files/0002-fix-older-systems.patch | 60 ++++++++++++++++++++++
2 files changed, 62 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ixwebsocket/Portfile b/net/ixwebsocket/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2eeaee3987b..6304c810a92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ixwebsocket/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ixwebsocket/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,8 @@ github.tarball_from archive
</span>
# https://github.com/machinezone/IXWebSocket/pull/512
patchfiles-append 0001-IXSocket.h-add-missing-sys-types.h-for-macOS.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/machinezone/IXWebSocket/pull/515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0002-fix-older-systems.patch
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ixwebsocket/files/0002-fix-older-systems.patch b/net/ixwebsocket/files/0002-fix-older-systems.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..128ae9b258c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ixwebsocket/files/0002-fix-older-systems.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e9366b030c5a7151e5364463b212c7e41f0f666e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 22 Apr 2024 16:48:50 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix for missing AI_NUMERICSERV on < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ixwebsocket/IXDNSLookup.cpp | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ixwebsocket/IXDNSLookup.cpp ixwebsocket/IXDNSLookup.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5966be23..cc39a383 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ixwebsocket/IXDNSLookup.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ixwebsocket/IXDNSLookup.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AI_NUMERICSERV 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace ix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int64_t DNSLookup::kDefaultWait = 1; // ms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f315e1f91321cc436d48a0a86886d2b16403e77b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 22 Apr 2024 16:52:09 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Do not use pthread_setname_np on < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ixwebsocket/IXSetThreadName.cpp | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ixwebsocket/IXSetThreadName.cpp ixwebsocket/IXSetThreadName.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b1e77379..2f4ee75b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ixwebsocket/IXSetThreadName.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ixwebsocket/IXSetThreadName.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pthread_np.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +62,7 @@ namespace ix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void setThreadName(const std::string& name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Apple reserves 16 bytes for its thread names
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Notice that the Apple version of pthread_setname_np
</span></pre><pre style='margin:0'>
</pre>