diff options
| author | Gleb Popov <arrowd@FreeBSD.org> | 2025-06-12 11:17:19 +0300 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2025-06-16 19:08:18 +0300 |
| commit | f70a5664c09dcb2d93a364d74ba722ddf021d345 (patch) | |
| tree | 9da7508ca4bf1af81ab0d008c8a8350e5683acef | |
| parent | devel/thunar-vcs-plugin: Fix SVN libs detection (diff) | |
devel/qt6-base: Pull in patches from upstream to fix a busy-loop bug
PR: 252934
Approved by: jhale
Pull Request: https://github.com/freebsd/freebsd-ports/pull/410
3 files changed, 31 insertions, 0 deletions
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 35177a19e371..e3ec93bddc7c 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,5 +1,6 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- diff --git a/devel/qt6-base/files/patch-src_corelib_kernel_qeventdispatcher__glib.cpp b/devel/qt6-base/files/patch-src_corelib_kernel_qeventdispatcher__glib.cpp new file mode 100644 index 000000000000..1c20f8d819fc --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_kernel_qeventdispatcher__glib.cpp @@ -0,0 +1,17 @@ +https://codereview.qt-project.org/c/qt/qtbase/+/651677 + +--- src/corelib/kernel/qeventdispatcher_glib.cpp.orig 2025-02-13 17:45:28 UTC ++++ src/corelib/kernel/qeventdispatcher_glib.cpp +@@ -434,10 +434,10 @@ void QEventDispatcherGlib::registerSocketNotifier(QSoc + p->pollfd.events = G_IO_IN | G_IO_HUP | G_IO_ERR; + break; + case QSocketNotifier::Write: +- p->pollfd.events = G_IO_OUT | G_IO_ERR; ++ p->pollfd.events = G_IO_OUT | G_IO_HUP | G_IO_ERR; + break; + case QSocketNotifier::Exception: +- p->pollfd.events = G_IO_PRI | G_IO_ERR; ++ p->pollfd.events = G_IO_PRI | G_IO_HUP | G_IO_ERR; + break; + } + p->socketNotifier = notifier; diff --git a/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp b/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp new file mode 100644 index 000000000000..a61cd8a94a13 --- /dev/null +++ b/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp @@ -0,0 +1,13 @@ +https://codereview.qt-project.org/c/qt/qtbase/+/651678 + +--- src/network/socket/qnativesocketengine_unix.cpp.orig 2025-06-08 12:42:24 UTC ++++ src/network/socket/qnativesocketengine_unix.cpp +@@ -1379,7 +1379,7 @@ int QNativeSocketEnginePrivate::nativeSelect(QDeadline + } + + static const short read_flags = POLLIN | POLLHUP | POLLERR; +- static const short write_flags = POLLOUT | POLLERR; ++ static const short write_flags = POLLOUT | POLLHUP | POLLERR; + + *selectForRead = ((pfd.revents & read_flags) != 0); + *selectForWrite = ((pfd.revents & write_flags) != 0); |