From 9ce52f8c564b5199a0df0591a20fc54abe68e88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 6 Dec 2023 21:44:18 +0000 Subject: [PATCH] [qcoro] Update to 0.10.0 (#35532) --- ...0001-qt6-deprecated-qwebsocket-error.patch | 19 ------------------- ports/qcoro/portfile.cmake | 3 +-- ports/qcoro/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qcoro.json | 5 +++++ 5 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch diff --git a/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch b/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch deleted file mode 100644 index 9f84b4319a93e1..00000000000000 --- a/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/qcoro/websockets/qcorowebsocket.cpp b/qcoro/websockets/qcorowebsocket.cpp -index be9c1f7..c686d14 100644 ---- a/qcoro/websockets/qcorowebsocket.cpp -+++ b/qcoro/websockets/qcorowebsocket.cpp -@@ -32,7 +32,13 @@ public: - emitReady(true); - } - })) -- , mError(connect(socket, qOverload(&QWebSocket::error), this, [this](auto error) { -+ , mError(connect(socket, qOverload( -+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) -+ &QWebSocket::errorOccurred -+#else -+ &QWebSocket::error -+#endif -+ ), this, [this](auto error) { - qWarning() << "QWebSocket failed to connect to a websocket server: " << error; - emitReady(false); - })) diff --git a/ports/qcoro/portfile.cmake b/ports/qcoro/portfile.cmake index 141554d50e3046..4ab92f3419b993 100644 --- a/ports/qcoro/portfile.cmake +++ b/ports/qcoro/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danvratil/qcoro REF "v${VERSION}" - SHA512 f708e1a82861c39434d6934172246c3280864e933b333b56c0471f1a629f9da65554d1508af4291ac2257ad8df2040655394ae5525d728710de5bd83cef8fbee + SHA512 de2e55256d3c9d35fec3ef6dc78128801b70a5e5b8ff0f3a6f235dac17f349ea44207a7c9f35375215dbeea04cb67c3412d505d0a8a95f2b926775f804a02649 HEAD_REF main - PATCHES 0001-qt6-deprecated-qwebsocket-error.patch ) vcpkg_check_features( diff --git a/ports/qcoro/vcpkg.json b/ports/qcoro/vcpkg.json index 3000d2faa70269..ca8cc009f2ae26 100644 --- a/ports/qcoro/vcpkg.json +++ b/ports/qcoro/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qcoro", - "version": "0.9.0", + "version": "0.10.0", "description": "Coroutine support for Qt", "homepage": "https://www.github.com/danvratil/qcoro", "documentation": "https://qcoro.dvratil.cz", diff --git a/versions/baseline.json b/versions/baseline.json index 9b6ba5df7648a9..7ee0869142d47d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6869,7 +6869,7 @@ "port-version": 0 }, "qcoro": { - "baseline": "0.9.0", + "baseline": "0.10.0", "port-version": 0 }, "qcustomplot": { diff --git a/versions/q-/qcoro.json b/versions/q-/qcoro.json index 4a347717df90d6..245b1245bb6746 100644 --- a/versions/q-/qcoro.json +++ b/versions/q-/qcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98bf3c0f6c546401e5976e2d474765d838050fd3", + "version": "0.10.0", + "port-version": 0 + }, { "git-tree": "0b82c30bd542212b17946094149433dda747515f", "version": "0.9.0",