freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devel/qt6-base: Pull in patches from upstream to fix a busy-loop bug

Browse Source 
PR:		252934
Approved by:	jhale
Pull Request:	https://github.com/freebsd/freebsd-ports/pull/410
This commit is contained in:
Gleb Popov 2025-06-12 11:17:19 +03:00
parent 7feb24c6a3
commit f70a5664c0
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devel/qt6-base/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= base PORTNAME= base
DISTVERSION= ${QT6_VERSION} DISTVERSION= ${QT6_VERSION}
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
PKGNAMEPREFIX= qt6- PKGNAMEPREFIX= qt6-

17
devel/qt6-base/files/patch-src_corelib_kernel_qeventdispatcher__glib.cpp Normal file
View File

@ -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;

13
devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp Normal file
View File

@ -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);