Download raw body.
Remove FLAVOR in devel/qcoro
Here is a diff to replace the Qt5 default with the Qt6 FLAVOR.
We haven't seen any Qt5 users for a long time! All ports are using
the Qt6 FLAVOR so make it default.
- Remove qt5 FLAVOR in consumer and bump REVISION.
- Add quirks entry 'qcoro-qt6' => 'qcoro'
- Add pkgpath and conflict in main PLIST.
Have I forgotten anything?
Rafael
diff --git a/devel/qcoro/Makefile b/devel/qcoro/Makefile
index 192c3633901..f6e1b898efc 100644
--- a/devel/qcoro/Makefile
+++ b/devel/qcoro/Makefile
@@ -5,14 +5,10 @@ GH_ACCOUNT = danvratil
GH_PROJECT = qcoro
GH_TAGNAME = v${V}
-CATEGORIES = devel
+FULLPKGNAME= qcoro-${V}
+REVISION= 0
-SHARED_LIBS += QCoro5Core 0.0 # 0.0
-SHARED_LIBS += QCoro5DBus 1.0 # 0.0
-SHARED_LIBS += QCoro5Network 1.0 # 0.0
-SHARED_LIBS += QCoro5Qml 0.1 # 0.0
-SHARED_LIBS += QCoro5Quick 1.0 # 0.0
-SHARED_LIBS += QCoro5WebSockets 1.0 # 0.0
+CATEGORIES = devel
SHARED_LIBS += QCoro6Core 0.0 # 0.0
SHARED_LIBS += QCoro6DBus 1.0 # 0.0
@@ -28,38 +24,18 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# MIT
PERMIT_PACKAGE = Yes
-FLAVORS = qt6
-FLAVOR ?=
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Network
+WANTLIB += Qt6OpenGL Qt6Qml Qt6QmlMeta Qt6QmlModels Qt6QmlWorkerScript
+WANTLIB += Qt6Quick Qt6WebSockets m
# Coroutines are part of C++ 20 and implemented in GCC 10
COMPILER = base-clang ports-clang
-MODULES = devel/cmake
-
-.if ${FLAVOR:Mqt6}
-FULLPKGNAME= qcoro-qt6-${V}
-REVISION= 0
-
-WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Network
-WANTLIB += Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6WebSockets
-WANTLIB += m
-
-MODULES += x11/qt6
+MODULES = devel/cmake \
+ x11/qt6
LIB_DEPENDS = x11/qt6/qtdeclarative \
x11/qt6/qtwebsockets
-.else
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Network
-WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5WebSockets m
-
-MODULES += x11/qt5
-
-LIB_DEPENDS = x11/qt5/qtdeclarative \
- x11/qt5/qtwebsockets
-
-CONFIGURE_ARGS =-DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON \
- -DUSE_QT_VERSION=5
-.endif
CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON
diff --git a/devel/qcoro/pkg/PFRAG.no-qt6 b/devel/qcoro/pkg/PFRAG.no-qt6
deleted file mode 100644
index b1d016eb395..00000000000
--- a/devel/qcoro/pkg/PFRAG.no-qt6
+++ /dev/null
@@ -1,141 +0,0 @@
-include/qcoro5/
-include/qcoro5/QCoro/
-include/qcoro5/QCoro/QCoro
-include/qcoro5/QCoro/QCoroAbstractSocket
-include/qcoro5/QCoro/QCoroAsyncGenerator
-include/qcoro5/QCoro/QCoroCore
-include/qcoro5/QCoro/QCoroDBus
-include/qcoro5/QCoro/QCoroDBusPendingCall
-include/qcoro5/QCoro/QCoroDBusPendingReply
-include/qcoro5/QCoro/QCoroFuture
-include/qcoro5/QCoro/QCoroFwd
-include/qcoro5/QCoro/QCoroGenerator
-include/qcoro5/QCoro/QCoroIODevice
-include/qcoro5/QCoro/QCoroImageProvider
-include/qcoro5/QCoro/QCoroLazyTask
-include/qcoro5/QCoro/QCoroLocalSocket
-include/qcoro5/QCoro/QCoroNetwork
-include/qcoro5/QCoro/QCoroNetworkReply
-include/qcoro5/QCoro/QCoroProcess
-include/qcoro5/QCoro/QCoroQml
-include/qcoro5/QCoro/QCoroQmlTask
-include/qcoro5/QCoro/QCoroSignal
-include/qcoro5/QCoro/QCoroTask
-include/qcoro5/QCoro/QCoroTcpServer
-include/qcoro5/QCoro/QCoroTest
-include/qcoro5/QCoro/QCoroThread
-include/qcoro5/QCoro/QCoroTimer
-include/qcoro5/QCoro/QCoroWebSocket
-include/qcoro5/QCoro/QCoroWebSocketServer
-include/qcoro5/QCoro/QCoroWebSockets
-include/qcoro5/QCoro/Task
-include/qcoro5/qcoro/
-include/qcoro5/qcoro/concepts_p.h
-include/qcoro5/qcoro/config.h
-include/qcoro5/qcoro/coroutine.h
-include/qcoro5/qcoro/impl/
-include/qcoro5/qcoro/impl/connect.h
-include/qcoro5/qcoro/impl/isqprivatesignal.h
-include/qcoro5/qcoro/impl/lazytask.h
-include/qcoro5/qcoro/impl/task.h
-include/qcoro5/qcoro/impl/taskawaiterbase.h
-include/qcoro5/qcoro/impl/taskbase.h
-include/qcoro5/qcoro/impl/taskfinalsuspend.h
-include/qcoro5/qcoro/impl/taskpromise.h
-include/qcoro5/qcoro/impl/taskpromisebase.h
-include/qcoro5/qcoro/impl/waitfor.h
-include/qcoro5/qcoro/macros_p.h
-include/qcoro5/qcoro/qcoro.h
-include/qcoro5/qcoro/qcoroabstractsocket.h
-include/qcoro5/qcoro/qcoroasyncgenerator.h
-include/qcoro5/qcoro/qcorocore.h
-include/qcoro5/qcoro/qcorocore_export.h
-include/qcoro5/qcoro/qcorodbus.h
-include/qcoro5/qcoro/qcorodbus_export.h
-include/qcoro5/qcoro/qcorodbuspendingcall.h
-include/qcoro5/qcoro/qcorodbuspendingreply.h
-include/qcoro5/qcoro/qcorofuture.h
-include/qcoro5/qcoro/qcorofwd.h
-include/qcoro5/qcoro/qcorogenerator.h
-include/qcoro5/qcoro/qcoroimageprovider.h
-include/qcoro5/qcoro/qcoroiodevice.h
-include/qcoro5/qcoro/qcorolazytask.h
-include/qcoro5/qcoro/qcorolocalsocket.h
-include/qcoro5/qcoro/qcoronetwork.h
-include/qcoro5/qcoro/qcoronetwork_export.h
-include/qcoro5/qcoro/qcoronetworkreply.h
-include/qcoro5/qcoro/qcoroprocess.h
-include/qcoro5/qcoro/qcoroqml.h
-include/qcoro5/qcoro/qcoroqml_export.h
-include/qcoro5/qcoro/qcoroqmltask.h
-include/qcoro5/qcoro/qcoroquick_export.h
-include/qcoro5/qcoro/qcorosignal.h
-include/qcoro5/qcoro/qcorotask.h
-include/qcoro5/qcoro/qcorotcpserver.h
-include/qcoro5/qcoro/qcorotest.h
-include/qcoro5/qcoro/qcorothread.h
-include/qcoro5/qcoro/qcorotimer.h
-include/qcoro5/qcoro/qcorowebsocket.h
-include/qcoro5/qcoro/qcorowebsockets.h
-include/qcoro5/qcoro/qcorowebsockets_export.h
-include/qcoro5/qcoro/qcorowebsocketserver.h
-include/qcoro5/qcoro/task.h
-include/qcoro5/qcoro/waitoperationbase_p.h
-lib/cmake/QCoro5/
-lib/cmake/QCoro5/QCoro5Config.cmake
-lib/cmake/QCoro5/QCoro5ConfigVersion.cmake
-lib/cmake/QCoro5Core/
-lib/cmake/QCoro5Core/QCoro5CoreConfig.cmake
-lib/cmake/QCoro5Core/QCoro5CoreConfigVersion.cmake
-lib/cmake/QCoro5Core/QCoro5CoreTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro5Core/QCoro5CoreTargets.cmake
-lib/cmake/QCoro5Coro/
-lib/cmake/QCoro5Coro/QCoro5CoroConfig.cmake
-lib/cmake/QCoro5Coro/QCoro5CoroConfigVersion.cmake
-lib/cmake/QCoro5Coro/QCoro5CoroTargets.cmake
-lib/cmake/QCoro5Coro/QCoroMacros.cmake
-lib/cmake/QCoro5DBus/
-lib/cmake/QCoro5DBus/QCoro5DBusConfig.cmake
-lib/cmake/QCoro5DBus/QCoro5DBusConfigVersion.cmake
-lib/cmake/QCoro5DBus/QCoro5DBusTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro5DBus/QCoro5DBusTargets.cmake
-lib/cmake/QCoro5Network/
-lib/cmake/QCoro5Network/QCoro5NetworkConfig.cmake
-lib/cmake/QCoro5Network/QCoro5NetworkConfigVersion.cmake
-lib/cmake/QCoro5Network/QCoro5NetworkTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro5Network/QCoro5NetworkTargets.cmake
-lib/cmake/QCoro5Qml/
-lib/cmake/QCoro5Qml/QCoro5QmlConfig.cmake
-lib/cmake/QCoro5Qml/QCoro5QmlConfigVersion.cmake
-lib/cmake/QCoro5Qml/QCoro5QmlTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro5Qml/QCoro5QmlTargets.cmake
-lib/cmake/QCoro5Quick/
-lib/cmake/QCoro5Quick/QCoro5QuickConfig.cmake
-lib/cmake/QCoro5Quick/QCoro5QuickConfigVersion.cmake
-lib/cmake/QCoro5Quick/QCoro5QuickTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro5Quick/QCoro5QuickTargets.cmake
-lib/cmake/QCoro5Test/
-lib/cmake/QCoro5Test/QCoro5TestConfig.cmake
-lib/cmake/QCoro5Test/QCoro5TestConfigVersion.cmake
-lib/cmake/QCoro5Test/QCoro5TestTargets.cmake
-lib/cmake/QCoro5WebSockets/
-lib/cmake/QCoro5WebSockets/QCoro5WebSocketsConfig.cmake
-lib/cmake/QCoro5WebSockets/QCoro5WebSocketsConfigVersion.cmake
-lib/cmake/QCoro5WebSockets/QCoro5WebSocketsTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro5WebSockets/QCoro5WebSocketsTargets.cmake
-@lib lib/libQCoro5Core.so.${LIBQCoro5Core_VERSION}
-@lib lib/libQCoro5DBus.so.${LIBQCoro5DBus_VERSION}
-@lib lib/libQCoro5Network.so.${LIBQCoro5Network_VERSION}
-@lib lib/libQCoro5Qml.so.${LIBQCoro5Qml_VERSION}
-@lib lib/libQCoro5Quick.so.${LIBQCoro5Quick_VERSION}
-@lib lib/libQCoro5WebSockets.so.${LIBQCoro5WebSockets_VERSION}
-mkspecs/
-mkspecs/modules/
-mkspecs/modules/qt_QCoroCore.pri
-mkspecs/modules/qt_QCoroCoro.pri
-mkspecs/modules/qt_QCoroDBus.pri
-mkspecs/modules/qt_QCoroNetwork.pri
-mkspecs/modules/qt_QCoroQml.pri
-mkspecs/modules/qt_QCoroQuick.pri
-mkspecs/modules/qt_QCoroTest.pri
-mkspecs/modules/qt_QCoroWebSockets.pri
diff --git a/devel/qcoro/pkg/PFRAG.qt6 b/devel/qcoro/pkg/PFRAG.qt6
deleted file mode 100644
index 7e2829e3b16..00000000000
--- a/devel/qcoro/pkg/PFRAG.qt6
+++ /dev/null
@@ -1,139 +0,0 @@
-include/qcoro6/
-include/qcoro6/QCoro/
-include/qcoro6/QCoro/QCoro
-include/qcoro6/QCoro/QCoroAbstractSocket
-include/qcoro6/QCoro/QCoroAsyncGenerator
-include/qcoro6/QCoro/QCoroCore
-include/qcoro6/QCoro/QCoroDBus
-include/qcoro6/QCoro/QCoroDBusPendingCall
-include/qcoro6/QCoro/QCoroDBusPendingReply
-include/qcoro6/QCoro/QCoroFuture
-include/qcoro6/QCoro/QCoroFwd
-include/qcoro6/QCoro/QCoroGenerator
-include/qcoro6/QCoro/QCoroIODevice
-include/qcoro6/QCoro/QCoroImageProvider
-include/qcoro6/QCoro/QCoroLazyTask
-include/qcoro6/QCoro/QCoroLocalSocket
-include/qcoro6/QCoro/QCoroNetwork
-include/qcoro6/QCoro/QCoroNetworkReply
-include/qcoro6/QCoro/QCoroProcess
-include/qcoro6/QCoro/QCoroQml
-include/qcoro6/QCoro/QCoroQmlTask
-include/qcoro6/QCoro/QCoroSignal
-include/qcoro6/QCoro/QCoroTask
-include/qcoro6/QCoro/QCoroTcpServer
-include/qcoro6/QCoro/QCoroTest
-include/qcoro6/QCoro/QCoroThread
-include/qcoro6/QCoro/QCoroTimer
-include/qcoro6/QCoro/QCoroWebSocket
-include/qcoro6/QCoro/QCoroWebSocketServer
-include/qcoro6/QCoro/QCoroWebSockets
-include/qcoro6/QCoro/Task
-include/qcoro6/qcoro/
-include/qcoro6/qcoro/concepts_p.h
-include/qcoro6/qcoro/config.h
-include/qcoro6/qcoro/coroutine.h
-include/qcoro6/qcoro/impl/
-include/qcoro6/qcoro/impl/connect.h
-include/qcoro6/qcoro/impl/isqprivatesignal.h
-include/qcoro6/qcoro/impl/lazytask.h
-include/qcoro6/qcoro/impl/task.h
-include/qcoro6/qcoro/impl/taskawaiterbase.h
-include/qcoro6/qcoro/impl/taskbase.h
-include/qcoro6/qcoro/impl/taskfinalsuspend.h
-include/qcoro6/qcoro/impl/taskpromise.h
-include/qcoro6/qcoro/impl/taskpromisebase.h
-include/qcoro6/qcoro/impl/waitfor.h
-include/qcoro6/qcoro/macros_p.h
-include/qcoro6/qcoro/qcoro.h
-include/qcoro6/qcoro/qcoroabstractsocket.h
-include/qcoro6/qcoro/qcoroasyncgenerator.h
-include/qcoro6/qcoro/qcorocore.h
-include/qcoro6/qcoro/qcorocore_export.h
-include/qcoro6/qcoro/qcorodbus.h
-include/qcoro6/qcoro/qcorodbus_export.h
-include/qcoro6/qcoro/qcorodbuspendingcall.h
-include/qcoro6/qcoro/qcorodbuspendingreply.h
-include/qcoro6/qcoro/qcorofuture.h
-include/qcoro6/qcoro/qcorofwd.h
-include/qcoro6/qcoro/qcorogenerator.h
-include/qcoro6/qcoro/qcoroimageprovider.h
-include/qcoro6/qcoro/qcoroiodevice.h
-include/qcoro6/qcoro/qcorolazytask.h
-include/qcoro6/qcoro/qcorolocalsocket.h
-include/qcoro6/qcoro/qcoronetwork.h
-include/qcoro6/qcoro/qcoronetwork_export.h
-include/qcoro6/qcoro/qcoronetworkreply.h
-include/qcoro6/qcoro/qcoroprocess.h
-include/qcoro6/qcoro/qcoroqml.h
-include/qcoro6/qcoro/qcoroqml_export.h
-include/qcoro6/qcoro/qcoroqmltask.h
-include/qcoro6/qcoro/qcoroquick_export.h
-include/qcoro6/qcoro/qcorosignal.h
-include/qcoro6/qcoro/qcorotask.h
-include/qcoro6/qcoro/qcorotcpserver.h
-include/qcoro6/qcoro/qcorotest.h
-include/qcoro6/qcoro/qcorothread.h
-include/qcoro6/qcoro/qcorotimer.h
-include/qcoro6/qcoro/qcorowebsocket.h
-include/qcoro6/qcoro/qcorowebsockets.h
-include/qcoro6/qcoro/qcorowebsockets_export.h
-include/qcoro6/qcoro/qcorowebsocketserver.h
-include/qcoro6/qcoro/task.h
-include/qcoro6/qcoro/waitoperationbase_p.h
-lib/cmake/QCoro6/
-lib/cmake/QCoro6/QCoro6Config.cmake
-lib/cmake/QCoro6/QCoro6ConfigVersion.cmake
-lib/cmake/QCoro6Core/
-lib/cmake/QCoro6Core/QCoro6CoreConfig.cmake
-lib/cmake/QCoro6Core/QCoro6CoreConfigVersion.cmake
-lib/cmake/QCoro6Core/QCoro6CoreTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro6Core/QCoro6CoreTargets.cmake
-lib/cmake/QCoro6Coro/
-lib/cmake/QCoro6Coro/QCoro6CoroConfig.cmake
-lib/cmake/QCoro6Coro/QCoro6CoroConfigVersion.cmake
-lib/cmake/QCoro6Coro/QCoro6CoroTargets.cmake
-lib/cmake/QCoro6Coro/QCoroMacros.cmake
-lib/cmake/QCoro6DBus/
-lib/cmake/QCoro6DBus/QCoro6DBusConfig.cmake
-lib/cmake/QCoro6DBus/QCoro6DBusConfigVersion.cmake
-lib/cmake/QCoro6DBus/QCoro6DBusTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro6DBus/QCoro6DBusTargets.cmake
-lib/cmake/QCoro6Network/
-lib/cmake/QCoro6Network/QCoro6NetworkConfig.cmake
-lib/cmake/QCoro6Network/QCoro6NetworkConfigVersion.cmake
-lib/cmake/QCoro6Network/QCoro6NetworkTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro6Network/QCoro6NetworkTargets.cmake
-lib/cmake/QCoro6Qml/
-lib/cmake/QCoro6Qml/QCoro6QmlConfig.cmake
-lib/cmake/QCoro6Qml/QCoro6QmlConfigVersion.cmake
-lib/cmake/QCoro6Qml/QCoro6QmlTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro6Qml/QCoro6QmlTargets.cmake
-lib/cmake/QCoro6Quick/
-lib/cmake/QCoro6Quick/QCoro6QuickConfig.cmake
-lib/cmake/QCoro6Quick/QCoro6QuickConfigVersion.cmake
-lib/cmake/QCoro6Quick/QCoro6QuickTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro6Quick/QCoro6QuickTargets.cmake
-lib/cmake/QCoro6Test/
-lib/cmake/QCoro6Test/QCoro6TestConfig.cmake
-lib/cmake/QCoro6Test/QCoro6TestConfigVersion.cmake
-lib/cmake/QCoro6Test/QCoro6TestTargets.cmake
-lib/cmake/QCoro6WebSockets/
-lib/cmake/QCoro6WebSockets/QCoro6WebSocketsConfig.cmake
-lib/cmake/QCoro6WebSockets/QCoro6WebSocketsConfigVersion.cmake
-lib/cmake/QCoro6WebSockets/QCoro6WebSocketsTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QCoro6WebSockets/QCoro6WebSocketsTargets.cmake
-@lib lib/libQCoro6Core.so.${LIBQCoro6Core_VERSION}
-@lib lib/libQCoro6DBus.so.${LIBQCoro6DBus_VERSION}
-@lib lib/libQCoro6Network.so.${LIBQCoro6Network_VERSION}
-@lib lib/libQCoro6Qml.so.${LIBQCoro6Qml_VERSION}
-@lib lib/libQCoro6Quick.so.${LIBQCoro6Quick_VERSION}
-@lib lib/libQCoro6WebSockets.so.${LIBQCoro6WebSockets_VERSION}
-lib/qt6/mkspecs/modules/qt_QCoroCore.pri
-lib/qt6/mkspecs/modules/qt_QCoroCoro.pri
-lib/qt6/mkspecs/modules/qt_QCoroDBus.pri
-lib/qt6/mkspecs/modules/qt_QCoroNetwork.pri
-lib/qt6/mkspecs/modules/qt_QCoroQml.pri
-lib/qt6/mkspecs/modules/qt_QCoroQuick.pri
-lib/qt6/mkspecs/modules/qt_QCoroTest.pri
-lib/qt6/mkspecs/modules/qt_QCoroWebSockets.pri
diff --git a/devel/qcoro/pkg/PLIST b/devel/qcoro/pkg/PLIST
index 48224473412..e88084a2c25 100644
--- a/devel/qcoro/pkg/PLIST
+++ b/devel/qcoro/pkg/PLIST
@@ -1,2 +1,141 @@
-%%qt6%%
-!%%qt6%%
+@pkgpath devel/qcoro,qt6
+@conflict qcoro-<.12.0p0
+include/qcoro6/
+include/qcoro6/QCoro/
+include/qcoro6/QCoro/QCoro
+include/qcoro6/QCoro/QCoroAbstractSocket
+include/qcoro6/QCoro/QCoroAsyncGenerator
+include/qcoro6/QCoro/QCoroCore
+include/qcoro6/QCoro/QCoroDBus
+include/qcoro6/QCoro/QCoroDBusPendingCall
+include/qcoro6/QCoro/QCoroDBusPendingReply
+include/qcoro6/QCoro/QCoroFuture
+include/qcoro6/QCoro/QCoroFwd
+include/qcoro6/QCoro/QCoroGenerator
+include/qcoro6/QCoro/QCoroIODevice
+include/qcoro6/QCoro/QCoroImageProvider
+include/qcoro6/QCoro/QCoroLazyTask
+include/qcoro6/QCoro/QCoroLocalSocket
+include/qcoro6/QCoro/QCoroNetwork
+include/qcoro6/QCoro/QCoroNetworkReply
+include/qcoro6/QCoro/QCoroProcess
+include/qcoro6/QCoro/QCoroQml
+include/qcoro6/QCoro/QCoroQmlTask
+include/qcoro6/QCoro/QCoroSignal
+include/qcoro6/QCoro/QCoroTask
+include/qcoro6/QCoro/QCoroTcpServer
+include/qcoro6/QCoro/QCoroTest
+include/qcoro6/QCoro/QCoroThread
+include/qcoro6/QCoro/QCoroTimer
+include/qcoro6/QCoro/QCoroWebSocket
+include/qcoro6/QCoro/QCoroWebSocketServer
+include/qcoro6/QCoro/QCoroWebSockets
+include/qcoro6/QCoro/Task
+include/qcoro6/qcoro/
+include/qcoro6/qcoro/concepts_p.h
+include/qcoro6/qcoro/config.h
+include/qcoro6/qcoro/coroutine.h
+include/qcoro6/qcoro/impl/
+include/qcoro6/qcoro/impl/connect.h
+include/qcoro6/qcoro/impl/isqprivatesignal.h
+include/qcoro6/qcoro/impl/lazytask.h
+include/qcoro6/qcoro/impl/task.h
+include/qcoro6/qcoro/impl/taskawaiterbase.h
+include/qcoro6/qcoro/impl/taskbase.h
+include/qcoro6/qcoro/impl/taskfinalsuspend.h
+include/qcoro6/qcoro/impl/taskpromise.h
+include/qcoro6/qcoro/impl/taskpromisebase.h
+include/qcoro6/qcoro/impl/waitfor.h
+include/qcoro6/qcoro/macros_p.h
+include/qcoro6/qcoro/qcoro.h
+include/qcoro6/qcoro/qcoroabstractsocket.h
+include/qcoro6/qcoro/qcoroasyncgenerator.h
+include/qcoro6/qcoro/qcorocore.h
+include/qcoro6/qcoro/qcorocore_export.h
+include/qcoro6/qcoro/qcorodbus.h
+include/qcoro6/qcoro/qcorodbus_export.h
+include/qcoro6/qcoro/qcorodbuspendingcall.h
+include/qcoro6/qcoro/qcorodbuspendingreply.h
+include/qcoro6/qcoro/qcorofuture.h
+include/qcoro6/qcoro/qcorofwd.h
+include/qcoro6/qcoro/qcorogenerator.h
+include/qcoro6/qcoro/qcoroimageprovider.h
+include/qcoro6/qcoro/qcoroiodevice.h
+include/qcoro6/qcoro/qcorolazytask.h
+include/qcoro6/qcoro/qcorolocalsocket.h
+include/qcoro6/qcoro/qcoronetwork.h
+include/qcoro6/qcoro/qcoronetwork_export.h
+include/qcoro6/qcoro/qcoronetworkreply.h
+include/qcoro6/qcoro/qcoroprocess.h
+include/qcoro6/qcoro/qcoroqml.h
+include/qcoro6/qcoro/qcoroqml_export.h
+include/qcoro6/qcoro/qcoroqmltask.h
+include/qcoro6/qcoro/qcoroquick_export.h
+include/qcoro6/qcoro/qcorosignal.h
+include/qcoro6/qcoro/qcorotask.h
+include/qcoro6/qcoro/qcorotcpserver.h
+include/qcoro6/qcoro/qcorotest.h
+include/qcoro6/qcoro/qcorothread.h
+include/qcoro6/qcoro/qcorotimer.h
+include/qcoro6/qcoro/qcorowebsocket.h
+include/qcoro6/qcoro/qcorowebsockets.h
+include/qcoro6/qcoro/qcorowebsockets_export.h
+include/qcoro6/qcoro/qcorowebsocketserver.h
+include/qcoro6/qcoro/task.h
+include/qcoro6/qcoro/waitoperationbase_p.h
+lib/cmake/QCoro6/
+lib/cmake/QCoro6/QCoro6Config.cmake
+lib/cmake/QCoro6/QCoro6ConfigVersion.cmake
+lib/cmake/QCoro6Core/
+lib/cmake/QCoro6Core/QCoro6CoreConfig.cmake
+lib/cmake/QCoro6Core/QCoro6CoreConfigVersion.cmake
+lib/cmake/QCoro6Core/QCoro6CoreTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QCoro6Core/QCoro6CoreTargets.cmake
+lib/cmake/QCoro6Coro/
+lib/cmake/QCoro6Coro/QCoro6CoroConfig.cmake
+lib/cmake/QCoro6Coro/QCoro6CoroConfigVersion.cmake
+lib/cmake/QCoro6Coro/QCoro6CoroTargets.cmake
+lib/cmake/QCoro6Coro/QCoroMacros.cmake
+lib/cmake/QCoro6DBus/
+lib/cmake/QCoro6DBus/QCoro6DBusConfig.cmake
+lib/cmake/QCoro6DBus/QCoro6DBusConfigVersion.cmake
+lib/cmake/QCoro6DBus/QCoro6DBusTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QCoro6DBus/QCoro6DBusTargets.cmake
+lib/cmake/QCoro6Network/
+lib/cmake/QCoro6Network/QCoro6NetworkConfig.cmake
+lib/cmake/QCoro6Network/QCoro6NetworkConfigVersion.cmake
+lib/cmake/QCoro6Network/QCoro6NetworkTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QCoro6Network/QCoro6NetworkTargets.cmake
+lib/cmake/QCoro6Qml/
+lib/cmake/QCoro6Qml/QCoro6QmlConfig.cmake
+lib/cmake/QCoro6Qml/QCoro6QmlConfigVersion.cmake
+lib/cmake/QCoro6Qml/QCoro6QmlTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QCoro6Qml/QCoro6QmlTargets.cmake
+lib/cmake/QCoro6Quick/
+lib/cmake/QCoro6Quick/QCoro6QuickConfig.cmake
+lib/cmake/QCoro6Quick/QCoro6QuickConfigVersion.cmake
+lib/cmake/QCoro6Quick/QCoro6QuickTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QCoro6Quick/QCoro6QuickTargets.cmake
+lib/cmake/QCoro6Test/
+lib/cmake/QCoro6Test/QCoro6TestConfig.cmake
+lib/cmake/QCoro6Test/QCoro6TestConfigVersion.cmake
+lib/cmake/QCoro6Test/QCoro6TestTargets.cmake
+lib/cmake/QCoro6WebSockets/
+lib/cmake/QCoro6WebSockets/QCoro6WebSocketsConfig.cmake
+lib/cmake/QCoro6WebSockets/QCoro6WebSocketsConfigVersion.cmake
+lib/cmake/QCoro6WebSockets/QCoro6WebSocketsTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QCoro6WebSockets/QCoro6WebSocketsTargets.cmake
+@lib lib/libQCoro6Core.so.${LIBQCoro6Core_VERSION}
+@lib lib/libQCoro6DBus.so.${LIBQCoro6DBus_VERSION}
+@lib lib/libQCoro6Network.so.${LIBQCoro6Network_VERSION}
+@lib lib/libQCoro6Qml.so.${LIBQCoro6Qml_VERSION}
+@lib lib/libQCoro6Quick.so.${LIBQCoro6Quick_VERSION}
+@lib lib/libQCoro6WebSockets.so.${LIBQCoro6WebSockets_VERSION}
+lib/qt6/mkspecs/modules/qt_QCoroCore.pri
+lib/qt6/mkspecs/modules/qt_QCoroCoro.pri
+lib/qt6/mkspecs/modules/qt_QCoroDBus.pri
+lib/qt6/mkspecs/modules/qt_QCoroNetwork.pri
+lib/qt6/mkspecs/modules/qt_QCoroQml.pri
+lib/qt6/mkspecs/modules/qt_QCoroQuick.pri
+lib/qt6/mkspecs/modules/qt_QCoroTest.pri
+lib/qt6/mkspecs/modules/qt_QCoroWebSockets.pri
diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index 5511c710ad1..296c3c1c63a 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-7.124
+PKGNAME = quirks-7.125
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index 5574390a60c..9b96b7f6a24 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -630,6 +630,7 @@ my $stem_extensions = {
'py-numpy' => 'py3-numpy',
'py-Pillow' => 'py3-Pillow',
'py-opengl' => 'py3-opengl',
+ 'qcoro-qt6' => 'qcoro',
};
my $obsolete_reason = {};
diff --git a/x11/kde-applications/kaccounts-providers/Makefile b/x11/kde-applications/kaccounts-providers/Makefile
index d9a3375aa3e..7a3447a6a1a 100644
--- a/x11/kde-applications/kaccounts-providers/Makefile
+++ b/x11/kde-applications/kaccounts-providers/Makefile
@@ -1,6 +1,7 @@
COMMENT = online account providers for the KAccounts system
DISTNAME = kaccounts-providers-${VERSION}
+REVISION = 0
CATEGORIES = net devel
@@ -21,7 +22,7 @@ LIB_DEPENDS = devel/kf6/kcoreaddons \
devel/kf6/ki18n \
devel/kf6/kio \
devel/kf6/kpackage \
- devel/qcoro,qt6 \
+ devel/qcoro \
net/libaccounts-qt,qt6 \
x11/kde-applications/kf6-kaccounts-integration>=${VERSION} \
x11/qt6/qtdeclarative \
diff --git a/x11/kde-applications/kdenetwork-filesharing/Makefile b/x11/kde-applications/kdenetwork-filesharing/Makefile
index 901fadb7d4c..f047d4e4c4d 100644
--- a/x11/kde-applications/kdenetwork-filesharing/Makefile
+++ b/x11/kde-applications/kdenetwork-filesharing/Makefile
@@ -1,5 +1,6 @@
COMMENT = KDE Filesharing via Samba
DISTNAME = kdenetwork-filesharing-${VERSION}
+REVISION = 0
CATEGORIES = devel
WANTLIB += ${COMPILER_LIBCXX} GL KF6AuthCore KF6Completion KF6ConfigCore
@@ -13,7 +14,7 @@ MODKDE_TRANSLATIONS = yes
MODKF5_I18N_CONFLICT = yes
MODKF5_L10N_CONFLICT = yes
-BUILD_DEPENDS = devel/qcoro,qt6
+BUILD_DEPENDS = devel/qcoro
RUN_DEPENDS = net/samba \
x11/dbus,-suid
diff --git a/x11/kde-applications/kf6-kaccounts-integration/Makefile b/x11/kde-applications/kf6-kaccounts-integration/Makefile
index d694f8d2bdb..baef33b5335 100644
--- a/x11/kde-applications/kf6-kaccounts-integration/Makefile
+++ b/x11/kde-applications/kf6-kaccounts-integration/Makefile
@@ -2,6 +2,7 @@ COMMENT = library and QML module for Accounts-SSO and SignOn-SSO
DISTNAME = kaccounts-integration-${VERSION}
PKGNAME = kf6-kaccounts-integration-${VERSION}
+REVISION = 0
CATEGORIES = net devel
@@ -28,7 +29,7 @@ LIB_DEPENDS = devel/kf6/kcmutils \
devel/kf6/kio \
devel/kf6/kwallet \
devel/kf6/kwidgetsaddons \
- devel/qcoro,qt6 \
+ devel/qcoro \
net/libaccounts-qt,qt6 \
net/signond-qt6 \
x11/qt6/qtdeclarative
diff --git a/x11/kde-applications/kf6-kio-extras/Makefile b/x11/kde-applications/kf6-kio-extras/Makefile
index 06767d562a1..4cd615f4d62 100644
--- a/x11/kde-applications/kf6-kio-extras/Makefile
+++ b/x11/kde-applications/kf6-kio-extras/Makefile
@@ -1,6 +1,7 @@
COMMENT = extra functionality for kioslaves
DISTNAME = kio-extras-${VERSION}
PKGNAME = kf6-kio-extras-${VERSION}
+REVISION = 0
CATEGORIES = productivity net
@@ -55,7 +56,7 @@ LIB_DEPENDS = audio/taglib \
devel/kf6/sonnet \
devel/kf6/syntax-highlighting \
devel/libmtp \
- devel/qcoro,qt6 \
+ devel/qcoro \
graphics/openexr \
math/imath \
multimedia/phonon,qt6 \
diff --git a/x11/kde-applications/kontrast/Makefile b/x11/kde-applications/kontrast/Makefile
index ad542a5d4be..9f59672a641 100644
--- a/x11/kde-applications/kontrast/Makefile
+++ b/x11/kde-applications/kontrast/Makefile
@@ -1,5 +1,6 @@
COMMENT = color contrast checker
DISTNAME = kontrast-${VERSION}
+REVISION = 0
CATEGORIES = x11 graphics
WANTLIB += ${COMPILER_LIBCXX} GL KF6CoreAddons KF6Crash KF6I18n
@@ -24,7 +25,7 @@ RUN_DEPENDS = devel/kf6/kirigami \
LIB_DEPENDS = databases/futuresql \
devel/kf6/kcoreaddons \
devel/kf6/ki18n \
- devel/qcoro,qt6 \
+ devel/qcoro \
x11/qt6/qtdeclarative \
devel/kf6/kcrash \
x11/qt6/qtsvg
diff --git a/x11/kde-plasma/plasma-workspace/Makefile b/x11/kde-plasma/plasma-workspace/Makefile
index 56287505870..d415e7165f8 100644
--- a/x11/kde-plasma/plasma-workspace/Makefile
+++ b/x11/kde-plasma/plasma-workspace/Makefile
@@ -1,5 +1,6 @@
COMMENT = various components needed to run a Plasma-based environment
DISTNAME = plasma-workspace-${VERSION}
+REVISION = 0
SHARED_LIBS += colorcorrect 1.0 # 0.0
SHARED_LIBS += kfontinst 1.0 # 0.0
@@ -104,7 +105,7 @@ LIB_DEPENDS = audio/libcanberra \
devel/kf6/solid \
devel/kf6/sonnet \
devel/kf6/syntax-highlighting \
- devel/qcoro,qt6 \
+ devel/qcoro \
math/libqalculate \
multimedia/phonon,qt6 \
sysutils/libudev-openbsd \
diff --git a/x11/kde-plasma/powerdevil/Makefile b/x11/kde-plasma/powerdevil/Makefile
index e866844c7fc..344c7ef46a3 100644
--- a/x11/kde-plasma/powerdevil/Makefile
+++ b/x11/kde-plasma/powerdevil/Makefile
@@ -1,5 +1,6 @@
COMMENT = power management daemon
DISTNAME = powerdevil-${VERSION}
+REVISION = 0
WANTLIB += ${COMPILER_LIBCXX} GL KF6AuthCore KF6ColorScheme KF6Completion
WANTLIB += KF6ConfigCore KF6ConfigGui KF6ConfigWidgets KF6CoreAddons
@@ -50,7 +51,7 @@ LIB_DEPENDS = devel/kf6/kauth \
devel/kf6/kguiaddons \
devel/kf6/kxmlgui \
devel/kf6/solid \
- devel/qcoro,qt6 \
+ devel/qcoro \
sysutils/libudev-openbsd \
wayland/wayland \
x11/kde-plasma/libkscreen>=${VERSION} \
Remove FLAVOR in devel/qcoro