diff --git a/dev-libs/qcoro/Manifest b/dev-libs/qcoro/Manifest index 641ce9ed96600..d2129debb8c02 100644 --- a/dev-libs/qcoro/Manifest +++ b/dev-libs/qcoro/Manifest @@ -1,2 +1 @@ -DIST qcoro-0.12.0.tar.gz 161468 BLAKE2B a7b5f203e227dc2e5dd9f74ccc72b3ab2972803e613a1fede5c597e97e281e3817eff8f088b3abba82d96815e296e1106a324f33078b45607a13de31797bd154 SHA512 f1da90c4a9bec5f52ec9f40caa30c8465658c6ff005c6c7e89aeb97acc4aefd5e34030493b7e51313a6d2b3fc59114f6ed6751f31f1c132ece173f0e22154c37 DIST qcoro-0.13.0.tar.gz 163436 BLAKE2B 9b1df26c9b6ad9ea2309c94a3bc9ff0e88b7244c085569396e63b615ebd8136a20cc366e5f3d4638d212418cf0630ce49544f2907a11d35df03a96a38ec90b46 SHA512 bdb7a4080a0baa0c86765b181b9126cb3276c344d402b96683c984af559bd9af834a1e8bc9a63239eb76d0d102430ddfa8262cc72f6962f9d202b5e9a46ffce0 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 deleted file mode 100644 index 8121086fa23a2..0000000000000 --- a/dev-libs/qcoro/files/qcoro-0.12.0-qt-6.10-testfix.patch +++ /dev/null @@ -1,23 +0,0 @@ -From bc04b0f5ba37d6c71f9817fc44636ee7ec532fc6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -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 { - 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 deleted file mode 100644 index c3f6673a23840..0000000000000 --- a/dev-libs/qcoro/qcoro-0.12.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/danvratil/${PN}" -else - SRC_URI="https://github.com/danvratil/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="C++ Coroutine Library for Qt" -HOMEPAGE="https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro" - -LICENSE="MIT" -SLOT="0" -IUSE="dbus examples +network qml test websockets" - -REQUIRED_USE="examples? ( network )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtbase:6[dbus?,network?] - qml? ( - dev-qt/qtbase:6[gui] - dev-qt/qtdeclarative:6= - ) - websockets? ( dev-qt/qtwebsockets:6 ) -" -DEPEND="${RDEPEND} - examples? ( dev-qt/qtbase:6[concurrent,network,widgets] ) - test? ( dev-qt/qtbase:6[concurrent] ) -" - -PATCHES=( "${FILESDIR}/${P}-qt-6.10-testfix.patch" ) # bug 966347 - -src_configure() { - local mycmakeargs=( - -DUSE_QT_VERSION=6 - -DQCORO_BUILD_EXAMPLES=$(usex examples) - -DQCORO_WITH_QTDBUS=$(usex dbus) - -DQCORO_WITH_QTNETWORK=$(usex network) - -DQCORO_WITH_QML=$(usex qml) - -DQCORO_WITH_QTQUICK=$(usex qml) - -DQCORO_WITH_QTTEST=ON - -DBUILD_TESTING=$(usex test) - -DQCORO_WITH_QTWEBSOCKETS=$(usex websockets) - ) - cmake_src_configure -} - -src_install() { - if use examples; then - docinto examples - dodoc -r examples/* - fi - cmake_src_install -}