commit: 1910416ce4da62adfeae98d7e75a568bca82f0d7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Dec 10 21:23:07 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Dec 10 21:46:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1910416c
dev-libs/qcoro: Fix QCoroNetworkReply test on Qt 6.10 Closes: https://bugs.gentoo.org/966347 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../qcoro/files/qcoro-0.12.0-qt-6.10-testfix.patch | 23 ++++++++++++++++++++++ dev-libs/qcoro/qcoro-0.12.0.ebuild | 2 ++ 2 files changed, 25 insertions(+) diff --git a/dev-libs/qcoro/files/qcoro-0.12.0-qt-6.10-testfix.patch b/dev-libs/qcoro/files/qcoro-0.12.0-qt-6.10-testfix.patch new file mode 100644 index 000000000000..8121086fa23a --- /dev/null +++ b/dev-libs/qcoro/files/qcoro-0.12.0-qt-6.10-testfix.patch @@ -0,0 +1,23 @@ +From bc04b0f5ba37d6c71f9817fc44636ee7ec532fc6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <[email protected]> +Date: Wed, 10 Dec 2025 11:11:09 +0100 +Subject: [PATCH] Fix QCoroNetworkReply test on Qt 6.10 + +--- + tests/qcoronetworkreply.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/qcoronetworkreply.cpp b/tests/qcoronetworkreply.cpp +index 3623a469..aa94a1af 100644 +--- a/tests/qcoronetworkreply.cpp ++++ b/tests/qcoronetworkreply.cpp +@@ -175,7 +175,8 @@ class QCoroNetworkReplyTest : public QCoro::TestObject<QCoroNetworkReplyTest> { + auto reply = co_await nam.get(request); + QCORO_VERIFY(reply != nullptr); + QCORO_VERIFY(reply->isFinished()); +- QCORO_COMPARE(reply->error(), QNetworkReply::OperationCanceledError); ++ // Seems to depend on the Qt version which error we get. ++ QCORO_VERIFY(reply->error() == QNetworkReply::TimeoutError || reply->error() == QNetworkReply::OperationCanceledError); + // QNAM is destroyed here and so is all its associated state, which could + // crash (or cause invalid memory access) + } diff --git a/dev-libs/qcoro/qcoro-0.12.0.ebuild b/dev-libs/qcoro/qcoro-0.12.0.ebuild index aa3b1f6e16d2..c3f6673a2384 100644 --- a/dev-libs/qcoro/qcoro-0.12.0.ebuild +++ b/dev-libs/qcoro/qcoro-0.12.0.ebuild @@ -36,6 +36,8 @@ DEPEND="${RDEPEND} test? ( dev-qt/qtbase:6[concurrent] ) " +PATCHES=( "${FILESDIR}/${P}-qt-6.10-testfix.patch" ) # bug 966347 + src_configure() { local mycmakeargs=( -DUSE_QT_VERSION=6
