Download raw body.
devel/qcoro BUILD_SHARED_LIBS
It was noticed by many, but I couldn't find the time to investigate it.
So here is a diff to enable shared libraries in qcoro. I have checked
all consumers. Some have disappeared, some can only be built-only and
some have been moved to lib depends.
OK?
diff --git a/devel/qcoro/Makefile b/devel/qcoro/Makefile
index e4bf25a4947..1070ef4bc44 100644
--- a/devel/qcoro/Makefile
+++ b/devel/qcoro/Makefile
@@ -4,9 +4,24 @@ V = 0.10.0
GH_ACCOUNT = danvratil
GH_PROJECT = qcoro
GH_TAGNAME = v${V}
+REVISION= 0
CATEGORIES = devel
+SHARED_LIBS += QCoro5Core 0.0 # 0.0
+SHARED_LIBS += QCoro5DBus 0.0 # 0.0
+SHARED_LIBS += QCoro5Network 0.0 # 0.0
+SHARED_LIBS += QCoro5Qml 0.0 # 0.0
+SHARED_LIBS += QCoro5Quick 0.0 # 0.0
+SHARED_LIBS += QCoro5WebSockets 0.0 # 0.0
+
+SHARED_LIBS += QCoro6Core 0.0 # 0.0
+SHARED_LIBS += QCoro6DBus 0.0 # 0.0
+SHARED_LIBS += QCoro6Network 0.0 # 0.0
+SHARED_LIBS += QCoro6Qml 0.0 # 0.0
+SHARED_LIBS += QCoro6Quick 0.0 # 0.0
+SHARED_LIBS += QCoro6WebSockets 0.0 # 0.0
+
HOMEPAGE = https://qcoro.dvratil.cz/
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
@@ -24,16 +39,30 @@ MODULES = devel/cmake
.if ${FLAVOR:Mqt6}
FULLPKGNAME= qcoro-qt6-${V}
+
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Network
+WANTLIB += Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6WebSockets
+WANTLIB += m
+
MODULES += x11/qt6
-BUILD_DEPENDS = x11/qt6/qtwebsockets
+
+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
-BUILD_DEPENDS = x11/qt5/qtwebsockets
+
+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
+
TEST_IS_INTERACTIVE = X11
.include <bsd.port.mk>
diff --git a/devel/qcoro/pkg/PFRAG.no-qt6 b/devel/qcoro/pkg/PFRAG.no-qt6
index cc975529b7a..08ec5b752a8 100644
--- a/devel/qcoro/pkg/PFRAG.no-qt6
+++ b/devel/qcoro/pkg/PFRAG.no-qt6
@@ -77,7 +77,6 @@ include/qcoro5/qcoro/qcorowebsockets_export.h
include/qcoro5/qcoro/qcorowebsocketserver.h
include/qcoro5/qcoro/task.h
include/qcoro5/qcoro/waitoperationbase_p.h
-lib/cmake/
lib/cmake/QCoro5/
lib/cmake/QCoro5/QCoro5Config.cmake
lib/cmake/QCoro5/QCoro5ConfigVersion.cmake
@@ -120,12 +119,12 @@ lib/cmake/QCoro5WebSockets/QCoro5WebSocketsConfig.cmake
lib/cmake/QCoro5WebSockets/QCoro5WebSocketsConfigVersion.cmake
lib/cmake/QCoro5WebSockets/QCoro5WebSocketsTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/QCoro5WebSockets/QCoro5WebSocketsTargets.cmake
-@static-lib lib/libQCoro5Core.a
-@static-lib lib/libQCoro5DBus.a
-@static-lib lib/libQCoro5Network.a
-@static-lib lib/libQCoro5Qml.a
-@static-lib lib/libQCoro5Quick.a
-@static-lib lib/libQCoro5WebSockets.a
+@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
diff --git a/devel/qcoro/pkg/PFRAG.qt6 b/devel/qcoro/pkg/PFRAG.qt6
index b3035fca57f..92a2302aa40 100644
--- a/devel/qcoro/pkg/PFRAG.qt6
+++ b/devel/qcoro/pkg/PFRAG.qt6
@@ -120,12 +120,12 @@ lib/cmake/QCoro6WebSockets/QCoro6WebSocketsConfig.cmake
lib/cmake/QCoro6WebSockets/QCoro6WebSocketsConfigVersion.cmake
lib/cmake/QCoro6WebSockets/QCoro6WebSocketsTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/QCoro6WebSockets/QCoro6WebSocketsTargets.cmake
-@static-lib lib/libQCoro6Core.a
-@static-lib lib/libQCoro6DBus.a
-@static-lib lib/libQCoro6Network.a
-@static-lib lib/libQCoro6Qml.a
-@static-lib lib/libQCoro6Quick.a
-@static-lib lib/libQCoro6WebSockets.a
+@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/
lib/qt6/mkspecs/
lib/qt6/mkspecs/modules/
diff --git a/net/neochat/Makefile b/net/neochat/Makefile
index fa5a292ebb4..dc7c52b0527 100644
--- a/net/neochat/Makefile
+++ b/net/neochat/Makefile
@@ -1,6 +1,7 @@
COMMENT = client for Matrix chat
DISTNAME = neochat-${MODKDE_VERSION}
CATEGORIES= net
+REVISION = 0
SITES = ${SITE_KDE:=stable/release-service/${MODKDE_VERSION}/src/}
EXTRACT_SUFX = .tar.xz
@@ -15,10 +16,11 @@ WANTLIB += KF6ConfigCore KF6ConfigGui KF6CoreAddons KF6DBusAddons
WANTLIB += KF6I18n KF6ItemModels KF6JobWidgets KF6KIOCore KF6KIOGui
WANTLIB += KF6KIOWidgets KF6Notifications KF6Service KF6Solid
WANTLIB += KF6SonnetCore KF6StatusNotifierItem KF6WidgetsAddons
-WANTLIB += KF6WindowSystem Kirigami KirigamiPlatform Qt6Core Qt6DBus
-WANTLIB += Qt6Gui Qt6Multimedia Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels
-WANTLIB += Qt6Quick Qt6QuickControls2 Qt6Sql Qt6WebView Qt6Widgets
-WANTLIB += QuotientQt6 X11 c cmark icuuc m olm qt6keychain
+WANTLIB += KF6WindowSystem Kirigami KirigamiPlatform QCoro6Core
+WANTLIB += QCoro6Network Qt6Core Qt6DBus Qt6Gui Qt6Multimedia
+WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6QuickControls2
+WANTLIB += Qt6Sql Qt6WebView Qt6Widgets QuotientQt6 X11 c cmark
+WANTLIB += icuuc m olm qt6keychain
MODULES = x11/kde-applications \
devel/kf6
@@ -37,7 +39,6 @@ BUILD_DEPENDS = devel/gettext,-tools \
devel/kf6/qqc2-desktop-style \
graphics/kquickimageeditor>=0.2.0 \
devel/kf6/kquickcharts \
- devel/qcoro,qt6 \
graphics/kirigami-addons \
x11/qt6/qtlocation \
math/ecm
@@ -60,6 +61,7 @@ LIB_DEPENDS = devel/kf6/kconfig \
devel/kf6/solid \
devel/kf6/sonnet \
devel/olm \
+ devel/qcoro,qt6 \
security/qtkeychain,qt6 \
textproc/cmark \
x11/libquotient>=0.7 \
diff --git a/x11/kde-applications/kaccounts-integration/Makefile b/x11/kde-applications/kaccounts-integration/Makefile
index 71e826d9d66..6de9ee36d61 100644
--- a/x11/kde-applications/kaccounts-integration/Makefile
+++ b/x11/kde-applications/kaccounts-integration/Makefile
@@ -1,5 +1,5 @@
COMMENT = library and QML module for Accounts-SSO and SignOn-SSO
-REVISION = 0
+REVISION = 1
DISTNAME = kaccounts-integration-${VERSION}
diff --git a/x11/kde-applications/kdenetwork-filesharing/Makefile b/x11/kde-applications/kdenetwork-filesharing/Makefile
index 399856b9c09..11870efef8c 100644
--- a/x11/kde-applications/kdenetwork-filesharing/Makefile
+++ b/x11/kde-applications/kdenetwork-filesharing/Makefile
@@ -1,7 +1,7 @@
COMMENT = KDE Filesharing via Samba
DISTNAME = kdenetwork-filesharing-${VERSION}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
WANTLIB += ${COMPILER_LIBCXX} GL KF6AuthCore KF6Completion KF6ConfigCore
WANTLIB += KF6CoreAddons KF6I18n KF6JobWidgets KF6KIOCore KF6KIOGui
diff --git a/x11/kde-applications/kf6-kaccounts-integration/Makefile b/x11/kde-applications/kf6-kaccounts-integration/Makefile
index e40f5095683..c2aec455f50 100644
--- a/x11/kde-applications/kf6-kaccounts-integration/Makefile
+++ b/x11/kde-applications/kf6-kaccounts-integration/Makefile
@@ -2,7 +2,7 @@ COMMENT = library and QML module for Accounts-SSO and SignOn-SSO
DISTNAME = kaccounts-integration-${VERSION}
PKGNAME = kf6-kaccounts-integration-${VERSION}
-REVISION = 1
+REVISION = 2
CATEGORIES = net devel
@@ -11,15 +11,14 @@ SHARED_LIBS += kaccounts6 0.0 # 0.0
WANTLIB += ${COMPILER_LIBCXX} GL KF6ColorScheme KF6ConfigCore
WANTLIB += KF6ConfigGui KF6ConfigWidgets KF6CoreAddons KF6DBusAddons
WANTLIB += KF6I18n KF6KCMUtils KF6KCMUtilsCore KF6KCMUtilsQuick
-WANTLIB += KF6KIOCore KF6Wallet KF6WidgetsAddons Qt6Core Qt6DBus
-WANTLIB += Qt6Gui Qt6Network Qt6Qml Qt6Widgets Qt6Xml accounts-qt6
-WANTLIB += m signon-qt6
+WANTLIB += KF6KIOCore KF6Wallet KF6WidgetsAddons QCoro6Core Qt6Core
+WANTLIB += Qt6DBus Qt6Gui Qt6Network Qt6Qml Qt6Widgets Qt6Xml
+WANTLIB += accounts-qt6 m signon-qt6
MODKDE5_TRANSLATIONS = yes
MODKF5_L10N_CONFLICT = yes
MODKDE5_DESKTOP_FILE = yes
-BUILD_DEPENDS = devel/qcoro,qt6
LIB_DEPENDS = devel/kf6/kcmutils \
devel/kf6/kcolorscheme \
@@ -31,6 +30,7 @@ LIB_DEPENDS = devel/kf6/kcmutils \
devel/kf6/kio \
devel/kf6/kwallet \
devel/kf6/kwidgetsaddons \
+ devel/qcoro,qt6 \
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 1db591e5f2d..b0d59cbfaa9 100644
--- a/x11/kde-applications/kf6-kio-extras/Makefile
+++ b/x11/kde-applications/kf6-kio-extras/Makefile
@@ -1,7 +1,7 @@
COMMENT = extra functionality for kioslaves
DISTNAME = kio-extras-${VERSION}
PKGNAME = kf6-kio-extras-${VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = productivity net
@@ -16,16 +16,15 @@ WANTLIB += KF6KCMUtilsCore KF6KCMUtilsQuick KF6KIOCore KF6KIOFileWidgets
WANTLIB += KF6KIOGui KF6KIOWidgets KF6Service KF6Solid KF6SonnetUi
WANTLIB += KF6SyntaxHighlighting KF6TextWidgets KF6WidgetsAddons
WANTLIB += OpenEXR-3_2 OpenEXRCore-3_2 PlasmaActivities PlasmaActivitiesStats
-WANTLIB += Qt6Core Qt6Core5Compat Qt6DBus Qt6Gui Qt6Network Qt6Qml
-WANTLIB += Qt6Sql Qt6Svg Qt6Widgets Qt6Xml Xcursor c kdsoap-qt6
+WANTLIB += QCoro6Core Qt6Core Qt6Core5Compat Qt6DBus Qt6Gui Qt6Network
+WANTLIB += Qt6Qml Qt6Sql Qt6Svg Qt6Widgets Qt6Xml Xcursor c kdsoap-qt6
WANTLIB += m mtp phonon4qt6 phonon4qt6experimental smbclient ssh
WANTLIB += tag util
MODKDE5_TRANSLATIONS = yes
MODKDE5_DOCS = yes
-BUILD_DEPENDS = devel/qcoro,qt6 \
- devel/gperf \
+BUILD_DEPENDS = devel/gperf \
devel/kf6/kiconthemes \
devel/kf6/kpty
@@ -58,6 +57,7 @@ LIB_DEPENDS = audio/taglib \
devel/kf6/sonnet \
devel/kf6/syntax-highlighting \
devel/libmtp \
+ devel/qcoro,qt6 \
graphics/openexr \
multimedia/phonon,qt6 \
net/kdsoap,qt6 \
diff --git a/x11/kde-applications/kio-extras/Makefile b/x11/kde-applications/kio-extras/Makefile
index 7f434bca295..72dcd43351c 100644
--- a/x11/kde-applications/kio-extras/Makefile
+++ b/x11/kde-applications/kio-extras/Makefile
@@ -2,6 +2,7 @@ COMMENT = extra functionality for kioslaves
DISTNAME = kio-extras-kf5-${VERSION}
PKGNAME = kio-extras-${VERSION}
CATEGORIES = productivity net
+REVISION = 0
SHARED_LIBS += kioarchive 4.0 # 5.97
SHARED_LIBS += molletnetwork5 3.0 # 18.08
@@ -25,8 +26,7 @@ MODKDE_KF5 = yes
BUILD_DEPENDS = devel/gperf \
devel/kf5/kiconthemes \
- devel/kf5/kpty \
- devel/qcoro
+ devel/kf5/kpty
RUN_DEPENDS = devel/gperf \
devel/kf5/kiconthemes \
devel/qcoro BUILD_SHARED_LIBS