diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index eba64f948e61..fc95beff7d2e 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,118 +1,119 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (core, gui, widgets, network,...) BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libatk-1.0.so:accessibility/at-spi2-core \ libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libb2.so:devel/libb2 \ libbrotlidec.so:archivers/brotli \ libdbus-1.so:devel/dbus \ libdouble-conversion.so:devel/double-conversion \ libdrm.so:graphics/libdrm \ libevdev.so:devel/libevdev \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libharfbuzz.so:print/harfbuzz \ libicui18n.so:devel/icu \ libinput.so:x11/libinput \ libintl.so:devel/gettext-runtime \ libjpeg.so:graphics/jpeg-turbo \ libmtdev.so:devel/libmtdev \ libpcre2-16.so:devel/pcre2 \ libpng16.so:graphics/png \ libudev.so:devel/libudev-devd \ libvulkan.so:graphics/vulkan-loader \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd USES= cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \ qt-dist:6 shebangfix ssl USE_GL= egl opengl USE_GNOME= cairo gdkpixbuf glib20 gtk30 pango USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_LOCALE= C.UTF-8 SHEBANG_FILES= ${WRKSRC}/libexec/qt-android-runner.py \ ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ ${WRKSRC}/mkspecs/features/uikit/devices.py \ ${WRKSRC}/util/testrunner/qt-testrunner.py \ ${WRKSRC}/util/testrunner/sanitizer-testrunner.py CMAKE_ARGS= -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_LTTngUST \ QT_AVOID_CMAKE_ARCHIVING_API \ QT_FIND_ALL_PACKAGES_ALWAYS \ QT_FEATURE_openssl_linked CMAKE_OFF= QT_FEATURE_eglfs \ QT_FEATURE_gssapi # sql drivers are handled in the databases/qt6-base_sqldriver port CMAKE_OFF+= FEATURE_sql_mysql \ FEATURE_sql_odbc \ FEATURE_sql_psql \ FEATURE_sql_sqlite # zstd from base fails to compress files during the build (error 11: unsupported argument) BINARY_ALIAS= zstd=${LOCALBASE}/bin/zstd OPTIONS_DEFINE= CUPS X11 OPTIONS_DEFAULT= CUPS X11 OPTIONS_SUB= yes CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_BOOL= FEATURE_cups X11_LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-util.so:x11/xcb-util X11_USES= xorg X11_USE= XORG=ice,pixman,sm,x11,xau,xcb,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xi,xinerama,xrandr,xrender X11_CMAKE_BOOL= FEATURE_xcb \ FEATURE_xlib .include # LibreSSL does not currently support BIO_ADDR in DTLSv1_listen() .if ${SSL_DEFAULT:Mlibressl*} CMAKE_OFF+= QT_FEATURE_dtls PLIST_SUB+= DTLS="@comment " .else PLIST_SUB+= DTLS="" .endif .if ${ARCH} == "armv6" || ${ARCH} == "armv7" BUILD_DEPENDS+= as:devel/binutils CMAKE_ARGS+= -DCMAKE_ASM_FLAGS=-no-integrated-as .endif .if exists(/usr/include/sys/inotify.h) PLIST_SUB+= INOTIFY="" KQUEUE="@comment " EXTRA_PATCHES+= ${FILESDIR}/extrapatch-inotify .else PLIST_SUB+= INOTIFY="@comment " KQUEUE="" .endif post-patch: @${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \ ${WRKSRC}/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp post-install: # Install symlinks for user-facing tools while read line; do \ source="$$(${ECHO_CMD} $${line} | ${AWK} '{print $$1}')"; \ target="${STAGEDIR}${PREFIX}/$$(${ECHO_CMD} $${line} | ${AWK} '{print $$2}')"; \ ${RLN} $${source} $${target}; \ done <${BUILD_WRKSRC}/user_facing_tool_links.txt .include diff --git a/devel/qt6-base/files/patch-sock_seqpacket b/devel/qt6-base/files/patch-sock_seqpacket new file mode 100644 index 000000000000..0ce628239939 --- /dev/null +++ b/devel/qt6-base/files/patch-sock_seqpacket @@ -0,0 +1,105 @@ +https://codereview.qt-project.org/c/qt/qtbase/+/681531 +https://codereview.qt-project.org/c/qt/qtbase/+/682568 + +From 8e06365bee31ef5a1980b7b24d1564e3d769cfc7 Mon Sep 17 00:00:00 2001 +From: Gleb Popov +Date: Thu, 2 Oct 2025 13:14:54 +0300 +Subject: [PATCH] QNativeSocketEngine::read: Only treat readBytes==0 as a EOF + condition with stream sockets + +This change also covers SOCK_SEQPACKET type of sockets, which isn't great, +but allows to avoid an endless polling loop when waiting for read on +a disconnected socket. + +Pick-to: 6.10 +Change-Id: I6117b97c2c9b775e9e6fe9757bf4374365e3227d +Reviewed-by: Thiago Macieira +--- + src/network/socket/qnativesocketengine.cpp | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git src/network/socket/qnativesocketengine.cpp src/network/socket/qnativesocketengine.cpp +index f33e5a26bd94..4c83ef7e5df6 100644 +--- src/network/socket/qnativesocketengine.cpp ++++ src/network/socket/qnativesocketengine.cpp +@@ -910,12 +910,11 @@ qint64 QNativeSocketEngine::read(char *data, qint64 maxSize) + + qint64 readBytes = d->nativeRead(data, maxSize); + +- // Handle remote close +- if (readBytes == 0 && (d->socketType == QAbstractSocket::TcpSocket +-#ifndef QT_NO_SCTP +- || d->socketType == QAbstractSocket::SctpSocket +-#endif +- )) { ++ // Handle remote close. ++ // Non-datagram socket types signal the EOF state with a zero read. ++ // Note that it is perfectly fine to have a 0-byte message with datagram ++ // sockets (SOCK_DGRAM or SOCK_SEQPACKET). ++ if (readBytes == 0 && d->socketType != QAbstractSocket::UdpSocket) { + d->setError(QAbstractSocket::RemoteHostClosedError, + QNativeSocketEnginePrivate::RemoteHostClosedErrorString); + close(); +-- +2.43.0 + +From a395c091a56781352113670b72ba619367486e7e Mon Sep 17 00:00:00 2001 +From: Gleb Popov +Date: Tue, 7 Oct 2025 10:53:18 +0300 +Subject: [PATCH] Teach QNativeSocketEnginePrivate::fetchConnectionParameters() + about SOCK_SEQPACKET + +Pick-to: 6.10 +Change-Id: I4136ef3b4c198e3bd155884bde53171bd34959e4 +Reviewed-by: Thiago Macieira +--- + .../socket/qnativesocketengine_unix.cpp | 23 ++++++++++++------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git src/network/socket/qnativesocketengine_unix.cpp src/network/socket/qnativesocketengine_unix.cpp +index b5fbb5c2e003..bcd9aecdea97 100644 +--- src/network/socket/qnativesocketengine_unix.cpp ++++ src/network/socket/qnativesocketengine_unix.cpp +@@ -1244,6 +1244,7 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() + QT_SOCKOPTLEN_T valueSize = sizeof(int); + if (::getsockopt(socketDescriptor, SOL_SOCKET, SO_TYPE, &value, &valueSize) == 0) { + if (value == SOCK_STREAM) { ++ socketType = QAbstractSocket::TcpSocket; + #ifndef QT_NO_SCTP + if (option(QNativeSocketEngine::MaxStreamsSocketOption) != -1) { + socketType = QAbstractSocket::SctpSocket; +@@ -1266,17 +1267,23 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() + return false; + } + } +- } else { +- socketType = QAbstractSocket::TcpSocket; + } +-#else +- socketType = QAbstractSocket::TcpSocket; ++#endif ++ } else if (value == SOCK_DGRAM) { ++ socketType = QAbstractSocket::UdpSocket; ++#ifdef SOCK_SEQPACKET ++ } else if (value == SOCK_SEQPACKET) { ++ // We approximate the SEQPACKET socket type to TCP, because ++ // this enum is actually used to determine if the socket type has ++ // a notion of connection. SOCK_DGRAM are connectionless, while ++ // SOCK_STREAM and SOCK_SEQPACKET are connection-orientired. ++ // This mapping is still suboptimal, because it is possible to send ++ // a 0-byte packet via SEQPACKET socket and Qt will treat it as ++ // a disconnect. ++ socketType = QAbstractSocket::TcpSocket; + #endif + } else { +- if (value == SOCK_DGRAM) +- socketType = QAbstractSocket::UdpSocket; +- else +- socketType = QAbstractSocket::UnknownSocketType; ++ socketType = QAbstractSocket::UnknownSocketType; + } + } + #if defined (QNATIVESOCKETENGINE_DEBUG) +-- +2.43.0 +