Date: Thu, 29 Dec 2022 22:39:35 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 84fda3dfd1f5 - main - devel/qcoro: flavorize with qt5 and qt6 Message-ID: <202212292239.2BTMdZEq092981@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=84fda3dfd1f57b6b3dbf7a47d598a3d8593f61f8 commit 84fda3dfd1f57b6b3dbf7a47d598a3d8593f61f8 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2022-12-29 22:27:13 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2022-12-29 22:35:30 +0000 devel/qcoro: flavorize with qt5 and qt6 Requested by: KDE upstream --- devel/qcoro/Makefile | 16 +++- devel/qcoro/pkg-plist | 202 ++++++++++++++++++++++++------------------------ net-im/neochat/Makefile | 3 +- 3 files changed, 115 insertions(+), 106 deletions(-) diff --git a/devel/qcoro/Makefile b/devel/qcoro/Makefile index 621a54980e74..46d041b9adfa 100644 --- a/devel/qcoro/Makefile +++ b/devel/qcoro/Makefile @@ -1,7 +1,9 @@ PORTNAME= qcoro DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= devel kde +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Coroutines for Qt @@ -10,15 +12,21 @@ WWW= https://github.com/danvratil/qcoro LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSES/MIT.txt -USES= cmake compiler:c++17-lang pkgconfig qt:5 -USE_QT= concurrent core dbus declarative network testlib websockets \ - buildtools:build qmake:build +FLAVORS= qt5 qt6 +FLAVOR?= qt5 +USES= cmake compiler:c++17-lang pkgconfig qt:${FLAVOR:S/qt//} USE_GITHUB= yes GH_ACCOUNT= danvratil +_USE_QT_qt5= concurrent core dbus declarative network testlib websockets \ + buildtools:build qmake:build +_USE_QT_qt6= base websockets +USE_QT= ${_USE_QT_${FLAVOR}} CMAKE_OFF= QCORO_BUILD_EXAMPLES -CMAKE_ARGS= -DUSE_QT_VERSION=5 +CMAKE_ARGS= -DUSE_QT_VERSION=${FLAVOR:S/qt//} + +PLIST_SUB= QT_VER=${FLAVOR:S/qt//} BROKEN_FreeBSD_12= requires recent C++ compiler diff --git a/devel/qcoro/pkg-plist b/devel/qcoro/pkg-plist index a7918a6f9ab1..0a182d4513b2 100644 --- a/devel/qcoro/pkg-plist +++ b/devel/qcoro/pkg-plist @@ -1,104 +1,104 @@ -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/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/QCoroThread -include/qcoro5/QCoro/QCoroTimer -include/qcoro5/QCoro/QCoroWebSocket -include/qcoro5/QCoro/QCoroWebSocketServer -include/qcoro5/QCoro/QCoroWebSockets -include/qcoro5/QCoro/Task -include/qcoro5/qcoro/concepts_p.h -include/qcoro5/qcoro/config.h -include/qcoro5/qcoro/coroutine.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/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/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/QCoro5Config.cmake -lib/cmake/QCoro5/QCoro5ConfigVersion.cmake -lib/cmake/QCoro5Core/QCoro5CoreConfig.cmake -lib/cmake/QCoro5Core/QCoro5CoreConfigVersion.cmake -lib/cmake/QCoro5Core/QCoro5CoreTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QCoro5Core/QCoro5CoreTargets.cmake -lib/cmake/QCoro5Coro/QCoro5CoroConfig.cmake -lib/cmake/QCoro5Coro/QCoro5CoroConfigVersion.cmake -lib/cmake/QCoro5Coro/QCoro5CoroTargets.cmake -lib/cmake/QCoro5Coro/QCoroMacros.cmake -lib/cmake/QCoro5DBus/QCoro5DBusConfig.cmake -lib/cmake/QCoro5DBus/QCoro5DBusConfigVersion.cmake -lib/cmake/QCoro5DBus/QCoro5DBusTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QCoro5DBus/QCoro5DBusTargets.cmake -lib/cmake/QCoro5Network/QCoro5NetworkConfig.cmake -lib/cmake/QCoro5Network/QCoro5NetworkConfigVersion.cmake -lib/cmake/QCoro5Network/QCoro5NetworkTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QCoro5Network/QCoro5NetworkTargets.cmake -lib/cmake/QCoro5Qml/QCoro5QmlConfig.cmake -lib/cmake/QCoro5Qml/QCoro5QmlConfigVersion.cmake -lib/cmake/QCoro5Qml/QCoro5QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QCoro5Qml/QCoro5QmlTargets.cmake -lib/cmake/QCoro5Quick/QCoro5QuickConfig.cmake -lib/cmake/QCoro5Quick/QCoro5QuickConfigVersion.cmake -lib/cmake/QCoro5Quick/QCoro5QuickTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QCoro5Quick/QCoro5QuickTargets.cmake -lib/cmake/QCoro5WebSockets/QCoro5WebSocketsConfig.cmake -lib/cmake/QCoro5WebSockets/QCoro5WebSocketsConfigVersion.cmake -lib/cmake/QCoro5WebSockets/QCoro5WebSocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QCoro5WebSockets/QCoro5WebSocketsTargets.cmake -lib/libQCoro5Core.a -lib/libQCoro5DBus.a -lib/libQCoro5Network.a -lib/libQCoro5Qml.a -lib/libQCoro5Quick.a -lib/libQCoro5WebSockets.a +include/qcoro%%QT_VER%%/QCoro/QCoro +include/qcoro%%QT_VER%%/QCoro/QCoroAbstractSocket +include/qcoro%%QT_VER%%/QCoro/QCoroAsyncGenerator +include/qcoro%%QT_VER%%/QCoro/QCoroCore +include/qcoro%%QT_VER%%/QCoro/QCoroDBus +include/qcoro%%QT_VER%%/QCoro/QCoroDBusPendingCall +include/qcoro%%QT_VER%%/QCoro/QCoroDBusPendingReply +include/qcoro%%QT_VER%%/QCoro/QCoroFuture +include/qcoro%%QT_VER%%/QCoro/QCoroFwd +include/qcoro%%QT_VER%%/QCoro/QCoroGenerator +include/qcoro%%QT_VER%%/QCoro/QCoroIODevice +include/qcoro%%QT_VER%%/QCoro/QCoroImageProvider +include/qcoro%%QT_VER%%/QCoro/QCoroLocalSocket +include/qcoro%%QT_VER%%/QCoro/QCoroNetwork +include/qcoro%%QT_VER%%/QCoro/QCoroNetworkReply +include/qcoro%%QT_VER%%/QCoro/QCoroProcess +include/qcoro%%QT_VER%%/QCoro/QCoroQml +include/qcoro%%QT_VER%%/QCoro/QCoroQmlTask +include/qcoro%%QT_VER%%/QCoro/QCoroSignal +include/qcoro%%QT_VER%%/QCoro/QCoroTask +include/qcoro%%QT_VER%%/QCoro/QCoroTcpServer +include/qcoro%%QT_VER%%/QCoro/QCoroThread +include/qcoro%%QT_VER%%/QCoro/QCoroTimer +include/qcoro%%QT_VER%%/QCoro/QCoroWebSocket +include/qcoro%%QT_VER%%/QCoro/QCoroWebSocketServer +include/qcoro%%QT_VER%%/QCoro/QCoroWebSockets +include/qcoro%%QT_VER%%/QCoro/Task +include/qcoro%%QT_VER%%/qcoro/concepts_p.h +include/qcoro%%QT_VER%%/qcoro/config.h +include/qcoro%%QT_VER%%/qcoro/coroutine.h +include/qcoro%%QT_VER%%/qcoro/macros_p.h +include/qcoro%%QT_VER%%/qcoro/qcoro.h +include/qcoro%%QT_VER%%/qcoro/qcoroabstractsocket.h +include/qcoro%%QT_VER%%/qcoro/qcoroasyncgenerator.h +include/qcoro%%QT_VER%%/qcoro/qcorocore.h +include/qcoro%%QT_VER%%/qcoro/qcorocore_export.h +include/qcoro%%QT_VER%%/qcoro/qcorodbus.h +include/qcoro%%QT_VER%%/qcoro/qcorodbus_export.h +include/qcoro%%QT_VER%%/qcoro/qcorodbuspendingcall.h +include/qcoro%%QT_VER%%/qcoro/qcorodbuspendingreply.h +include/qcoro%%QT_VER%%/qcoro/qcorofuture.h +include/qcoro%%QT_VER%%/qcoro/qcorofwd.h +include/qcoro%%QT_VER%%/qcoro/qcorogenerator.h +include/qcoro%%QT_VER%%/qcoro/qcoroimageprovider.h +include/qcoro%%QT_VER%%/qcoro/qcoroiodevice.h +include/qcoro%%QT_VER%%/qcoro/qcorolocalsocket.h +include/qcoro%%QT_VER%%/qcoro/qcoronetwork.h +include/qcoro%%QT_VER%%/qcoro/qcoronetwork_export.h +include/qcoro%%QT_VER%%/qcoro/qcoronetworkreply.h +include/qcoro%%QT_VER%%/qcoro/qcoroprocess.h +include/qcoro%%QT_VER%%/qcoro/qcoroqml.h +include/qcoro%%QT_VER%%/qcoro/qcoroqml_export.h +include/qcoro%%QT_VER%%/qcoro/qcoroqmltask.h +include/qcoro%%QT_VER%%/qcoro/qcoroquick_export.h +include/qcoro%%QT_VER%%/qcoro/qcorosignal.h +include/qcoro%%QT_VER%%/qcoro/qcorotask.h +include/qcoro%%QT_VER%%/qcoro/qcorotcpserver.h +include/qcoro%%QT_VER%%/qcoro/qcorothread.h +include/qcoro%%QT_VER%%/qcoro/qcorotimer.h +include/qcoro%%QT_VER%%/qcoro/qcorowebsocket.h +include/qcoro%%QT_VER%%/qcoro/qcorowebsockets.h +include/qcoro%%QT_VER%%/qcoro/qcorowebsockets_export.h +include/qcoro%%QT_VER%%/qcoro/qcorowebsocketserver.h +include/qcoro%%QT_VER%%/qcoro/task.h +include/qcoro%%QT_VER%%/qcoro/waitoperationbase_p.h +lib/cmake/QCoro%%QT_VER%%/QCoro%%QT_VER%%Config.cmake +lib/cmake/QCoro%%QT_VER%%/QCoro%%QT_VER%%ConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%Core/QCoro%%QT_VER%%CoreConfig.cmake +lib/cmake/QCoro%%QT_VER%%Core/QCoro%%QT_VER%%CoreConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%Core/QCoro%%QT_VER%%CoreTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QCoro%%QT_VER%%Core/QCoro%%QT_VER%%CoreTargets.cmake +lib/cmake/QCoro%%QT_VER%%Coro/QCoro%%QT_VER%%CoroConfig.cmake +lib/cmake/QCoro%%QT_VER%%Coro/QCoro%%QT_VER%%CoroConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%Coro/QCoro%%QT_VER%%CoroTargets.cmake +lib/cmake/QCoro%%QT_VER%%Coro/QCoroMacros.cmake +lib/cmake/QCoro%%QT_VER%%DBus/QCoro%%QT_VER%%DBusConfig.cmake +lib/cmake/QCoro%%QT_VER%%DBus/QCoro%%QT_VER%%DBusConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%DBus/QCoro%%QT_VER%%DBusTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QCoro%%QT_VER%%DBus/QCoro%%QT_VER%%DBusTargets.cmake +lib/cmake/QCoro%%QT_VER%%Network/QCoro%%QT_VER%%NetworkConfig.cmake +lib/cmake/QCoro%%QT_VER%%Network/QCoro%%QT_VER%%NetworkConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%Network/QCoro%%QT_VER%%NetworkTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QCoro%%QT_VER%%Network/QCoro%%QT_VER%%NetworkTargets.cmake +lib/cmake/QCoro%%QT_VER%%Qml/QCoro%%QT_VER%%QmlConfig.cmake +lib/cmake/QCoro%%QT_VER%%Qml/QCoro%%QT_VER%%QmlConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%Qml/QCoro%%QT_VER%%QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QCoro%%QT_VER%%Qml/QCoro%%QT_VER%%QmlTargets.cmake +lib/cmake/QCoro%%QT_VER%%Quick/QCoro%%QT_VER%%QuickConfig.cmake +lib/cmake/QCoro%%QT_VER%%Quick/QCoro%%QT_VER%%QuickConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%Quick/QCoro%%QT_VER%%QuickTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QCoro%%QT_VER%%Quick/QCoro%%QT_VER%%QuickTargets.cmake +lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsConfig.cmake +lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsConfigVersion.cmake +lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QCoro%%QT_VER%%WebSockets/QCoro%%QT_VER%%WebSocketsTargets.cmake +lib/libQCoro%%QT_VER%%Core.a +lib/libQCoro%%QT_VER%%DBus.a +lib/libQCoro%%QT_VER%%Network.a +lib/libQCoro%%QT_VER%%Qml.a +lib/libQCoro%%QT_VER%%Quick.a +lib/libQCoro%%QT_VER%%WebSockets.a %%QT_MKSPECDIR%%/modules/qt_QCoroCore.pri %%QT_MKSPECDIR%%/modules/qt_QCoroCoro.pri %%QT_MKSPECDIR%%/modules/qt_QCoroDBus.pri diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile index fbcad26b7ca0..7c7aa741e8b3 100644 --- a/net-im/neochat/Makefile +++ b/net-im/neochat/Makefile @@ -1,5 +1,6 @@ PORTNAME= neochat DISTVERSION= 22.11 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= KDE/stable/plasma-mobile/${DISTVERSION} @@ -15,7 +16,7 @@ LIB_DEPENDS= libcmark.so:textproc/cmark \ BUILD_DEPENDS= libquotient>=0.6.11:net-im/libquotient \ kquickimageeditor>=0.2.0:graphics/kquickimageeditor \ kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons \ - ${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro + ${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro@qt5 # Quotient is a static lib, doesn't need to be in RUN_DEPENDS RUN_DEPENDS= kquickimageeditor>=0.2.0:graphics/kquickimageeditor \ kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212292239.2BTMdZEq092981>