diff --git a/devel/hyprwire/Makefile b/devel/hyprwire/Makefile index efc6535644ad..cd4610b68ff9 100644 --- a/devel/hyprwire/Makefile +++ b/devel/hyprwire/Makefile @@ -1,40 +1,40 @@ PORTNAME= hyprwire DISTVERSIONPREFIX= v -DISTVERSION= 0.2.1 +DISTVERSION= 0.3.0 CATEGORIES= devel MAINTAINER= tagattie@FreeBSD.org COMMENT= Fast and consistent wire protocol for IPC WWW= https://github.com/hyprwm/hyprwire LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libhyprutils.so:devel/hyprutils \ libffi.so:devel/libffi \ libpugixml.so:textproc/pugixml USES= cmake:testing compiler:c++11-lib pkgconfig USE_GITHUB= yes GH_ACCOUNT= hyprwm LDFLAGS+= -pthread PLIST_SUB= SOVERSION_FULL=${DISTVERSION} \ - SOVERSION_MAJOR=2 + SOVERSION_MAJOR=3 PORTDOCS= README.md OPTIONS_DEFINE= DOCS # XXX Drop after FreeBSD 13.5 EOL around 2026-04-30 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/hyprwire/distinfo b/devel/hyprwire/distinfo index e702b02f70a3..553e4286223e 100644 --- a/devel/hyprwire/distinfo +++ b/devel/hyprwire/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765327591 -SHA256 (hyprwm-hyprwire-v0.2.1_GH0.tar.gz) = a6370db771213fe10ebca5a2da748070a7034b09131847f973fda5d60b473c11 -SIZE (hyprwm-hyprwire-v0.2.1_GH0.tar.gz) = 32624 +TIMESTAMP = 1770709987 +SHA256 (hyprwm-hyprwire-v0.3.0_GH0.tar.gz) = ba3ff4b82620209d5680ce0e771d0f2c41f78cdb96d5d84fa66e4f0709ca8de6 +SIZE (hyprwm-hyprwire-v0.3.0_GH0.tar.gz) = 41897 diff --git a/devel/hyprwire/files/patch-src_core_client_ClientSocket.cpp b/devel/hyprwire/files/patch-src_core_client_ClientSocket.cpp deleted file mode 100644 index fb2c37a1aeab..000000000000 --- a/devel/hyprwire/files/patch-src_core_client_ClientSocket.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/client/ClientSocket.cpp.orig 2025-11-23 08:07:11 UTC -+++ src/core/client/ClientSocket.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/devel/hyprwire/files/patch-src_core_server_ServerClient.cpp b/devel/hyprwire/files/patch-src_core_server_ServerClient.cpp index e925ee87ce0b..aa05dfaec6dd 100644 --- a/devel/hyprwire/files/patch-src_core_server_ServerClient.cpp +++ b/devel/hyprwire/files/patch-src_core_server_ServerClient.cpp @@ -1,11 +1,45 @@ ---- src/core/server/ServerClient.cpp.orig 2025-11-23 08:04:14 UTC +--- src/core/server/ServerClient.cpp.orig 2026-02-04 11:08:13 UTC +++ src/core/server/ServerClient.cpp -@@ -7,6 +7,8 @@ - #include "../../helpers/Log.hpp" - #include "../../Macros.hpp" +@@ -13,6 +13,11 @@ + #include + #include -+#include ++#if defined(__FreeBSD__) ++#include ++#include ++#endif + - #include - #include + using namespace Hyprwire; + CServerClient::CServerClient(int fd) : m_fd(fd) { +@@ -31,19 +36,29 @@ void CServerClient::dispatchFirstPoll() { + + // get peer's pid + +-#if defined(__OpenBSD__) ++#if defined(__FreeBSD__) ++ struct xucred cred; ++#elif defined(__OpenBSD__) + struct sockpeercred cred; + #else + ucred cred; + #endif + socklen_t len = sizeof(cred); + ++#if defined(__FreeBSD__) ++ if (getsockopt(m_fd.get(), SOL_SOCKET, LOCAL_PEERCRED, &cred, &len) == -1) { ++#else + if (getsockopt(m_fd.get(), SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1) { ++#endif + TRACE(Debug::log(TRACE, "dispatchFirstPoll: failed to get pid")); + return; + } + ++#if defined(__FreeBSD__) ++ m_pid = cred.cr_pid; ++#else + m_pid = cred.pid; ++#endif + } + + void CServerClient::sendMessage(const IMessage& message) { diff --git a/devel/hyprwire/files/patch-src_core_server_ServerSocket.cpp b/devel/hyprwire/files/patch-src_core_server_ServerSocket.cpp deleted file mode 100644 index 680a7b75932d..000000000000 --- a/devel/hyprwire/files/patch-src_core_server_ServerSocket.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/server/ServerSocket.cpp.orig 2025-11-23 08:06:13 UTC -+++ src/core/server/ServerSocket.cpp -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/devel/hyprwire/files/patch-tests_Fork.cpp b/devel/hyprwire/files/patch-tests_Fork.cpp new file mode 100644 index 000000000000..eaf695a15ab2 --- /dev/null +++ b/devel/hyprwire/files/patch-tests_Fork.cpp @@ -0,0 +1,10 @@ +--- tests/Fork.cpp.orig 2026-02-10 08:21:03 UTC ++++ tests/Fork.cpp +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #include "generated/test_protocol_v1-server.hpp" + #include "generated/test_protocol_v1-client.hpp"