Simple diff to remove net/libaccounts-qt (qt5) and replace it by
qt6 (new default without any suffix).
The idea is the same as with qcoro last week. An update replaces
libaccounts-qt-1.17 and libaccounts-qt6-1.17 with
libaccounts-qt6-1.17p0. All consumers bumped.
devel/quirks will be committed separately.
Feedback and OK welcome.
diff --git a/devel/kf6/purpose/Makefile b/devel/kf6/purpose/Makefile
index cb2b72095a4..3d6106df7f1 100644
--- a/devel/kf6/purpose/Makefile
+++ b/devel/kf6/purpose/Makefile
@@ -1,5 +1,6 @@
COMMENT = framework to create integrate services and actions
DISTNAME = purpose-${VERSION}
+REVISION = 0
SHARED_LIBS += KF6Purpose 0.0 # 0.0
SHARED_LIBS += KF6PurposeWidgets 0.0 # 0.0
@@ -33,7 +34,7 @@ LIB_DEPENDS = devel/kf6/kcompletion>=${MODKF6_VERSION} \
devel/kf6/solid>=${MODKF6_VERSION} \
x11/qt6/qtdeclarative
-LIB_DEPENDS += net/libaccounts-qt,qt6 \
+LIB_DEPENDS += net/libaccounts-qt \
x11/kde-applications/kf6-kaccounts-integration
# sucks
diff --git a/net/libaccounts-qt/Makefile b/net/libaccounts-qt/Makefile
index 07728b3fba0..62733e8f4ad 100644
--- a/net/libaccounts-qt/Makefile
+++ b/net/libaccounts-qt/Makefile
@@ -5,8 +5,9 @@ CATEGORIES = net
V = VERSION_1.17
DIST_TUPLE = gitlab accounts-sso libaccounts-qt ${V} .
DISTNAME = libaccounts-qt-${V:S/VERSION_//}
+FULLPKGNAME= libaccounts-qt-${V:S/VERSION_//}
+REVISION= 0
-SHARED_LIBS += accounts-qt5 0.0 # 1.4
SHARED_LIBS += accounts-qt6 0.0 # 1.4
HOMEPAGE = https://accounts-sso.gitlab.io/
@@ -16,24 +17,13 @@ MAINTAINER = Rafael Sadowski <[email protected]>
# LGPLv2.1+, GPLv2+
PERMIT_PACKAGE = Yes
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Test Qt6Xml accounts-glib
+WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
-FLAVORS= qt6
-FLAVOR ?=
-
-.if ${FLAVOR:Mqt6}
-FULLPKGNAME= libaccounts-qt6-${V:S/VERSION_//}
MODULES = x11/qt6 \
devel/qmake
-WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Test Qt6Xml accounts-glib
-WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
+
QT_VERSION = qt6
-.else
-MODULES = x11/qt5 \
- devel/qmake
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Test Qt5Xml accounts-glib
-WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
-QT_VERSION = qt5
-.endif
LIB_DEPENDS = net/libaccounts-glib \
devel/glib2
@@ -44,11 +34,10 @@ TEST_TARGET = check
TEST_IS_INTERACTIVE = Yes
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/Accounts/AccountsQt5Config.cmake.in \
- ${WRKSRC}/Accounts/AccountsQt6Config.cmake.in
+ ${SUBST_CMD} ${WRKSRC}/Accounts/AccountsQt6Config.cmake.in
post-install:
- mv ${PREFIX}/bin/accountstest ${PREFIX}/bin/accountstest-${QT_VERSION}
+ mv ${PREFIX}/bin/accountstest ${PREFIX}/bin/accountstest-qt6
.include <bsd.port.mk>
diff --git
a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
deleted file mode 100644
index 5b37053778d..00000000000
--- a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: Accounts/AccountsQt5Config.cmake.in
---- Accounts/AccountsQt5Config.cmake.in.orig
-+++ Accounts/AccountsQt5Config.cmake.in
-@@ -1,5 +1,5 @@
- # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
- # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-
--set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
-+set(ACCOUNTSQT_LIBRARIES
$${INSTALL_LIBDIR}/lib$${TARGET}.so.${LIBaccounts-qt5_VERSION})
- set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
diff --git a/net/libaccounts-qt/pkg/PFRAG.no-qt6
b/net/libaccounts-qt/pkg/PFRAG.no-qt6
deleted file mode 100644
index 54785e2337d..00000000000
--- a/net/libaccounts-qt/pkg/PFRAG.no-qt6
+++ /dev/null
@@ -1,29 +0,0 @@
-@bin bin/accountstest-qt5
-include/accounts-qt5/
-include/accounts-qt5/Accounts/
-include/accounts-qt5/Accounts/Account
-include/accounts-qt5/Accounts/AccountService
-include/accounts-qt5/Accounts/Application
-include/accounts-qt5/Accounts/AuthData
-include/accounts-qt5/Accounts/Error
-include/accounts-qt5/Accounts/Manager
-include/accounts-qt5/Accounts/Provider
-include/accounts-qt5/Accounts/Service
-include/accounts-qt5/Accounts/ServiceType
-include/accounts-qt5/Accounts/account-service.h
-include/accounts-qt5/Accounts/account.h
-include/accounts-qt5/Accounts/accountscommon.h
-include/accounts-qt5/Accounts/application.h
-include/accounts-qt5/Accounts/auth-data.h
-include/accounts-qt5/Accounts/error.h
-include/accounts-qt5/Accounts/manager.h
-include/accounts-qt5/Accounts/manager_p.h
-include/accounts-qt5/Accounts/provider.h
-include/accounts-qt5/Accounts/service-type.h
-include/accounts-qt5/Accounts/service.h
-include/accounts-qt5/Accounts/utils.h
-lib/cmake/AccountsQt5/
-lib/cmake/AccountsQt5/AccountsQt5Config.cmake
-lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake
-@lib lib/libaccounts-qt5.so.${LIBaccounts-qt5_VERSION}
-lib/pkgconfig/accounts-qt5.pc
diff --git a/net/libaccounts-qt/pkg/PFRAG.qt6 b/net/libaccounts-qt/pkg/PFRAG.qt6
deleted file mode 100644
index 6ad65887dc0..00000000000
--- a/net/libaccounts-qt/pkg/PFRAG.qt6
+++ /dev/null
@@ -1,30 +0,0 @@
-@bin bin/accountstest-qt6
-include/accounts-qt6/
-include/accounts-qt6/Accounts/
-include/accounts-qt6/Accounts/Account
-include/accounts-qt6/Accounts/AccountService
-include/accounts-qt6/Accounts/Application
-include/accounts-qt6/Accounts/AuthData
-include/accounts-qt6/Accounts/Error
-include/accounts-qt6/Accounts/Manager
-include/accounts-qt6/Accounts/Provider
-include/accounts-qt6/Accounts/Service
-include/accounts-qt6/Accounts/ServiceType
-include/accounts-qt6/Accounts/account-service.h
-include/accounts-qt6/Accounts/account.h
-include/accounts-qt6/Accounts/accountscommon.h
-include/accounts-qt6/Accounts/application.h
-include/accounts-qt6/Accounts/auth-data.h
-include/accounts-qt6/Accounts/error.h
-include/accounts-qt6/Accounts/manager.h
-include/accounts-qt6/Accounts/manager_p.h
-include/accounts-qt6/Accounts/provider.h
-include/accounts-qt6/Accounts/service-type.h
-include/accounts-qt6/Accounts/service.h
-include/accounts-qt6/Accounts/utils.h
-lib/cmake/
-lib/cmake/AccountsQt6/
-lib/cmake/AccountsQt6/AccountsQt6Config.cmake
-lib/cmake/AccountsQt6/AccountsQt6ConfigVersion.cmake
-@lib lib/libaccounts-qt6.so.${LIBaccounts-qt6_VERSION}
-lib/pkgconfig/accounts-qt6.pc
diff --git a/net/libaccounts-qt/pkg/PLIST b/net/libaccounts-qt/pkg/PLIST
index 48224473412..79713ea6184 100644
--- a/net/libaccounts-qt/pkg/PLIST
+++ b/net/libaccounts-qt/pkg/PLIST
@@ -1,2 +1,31 @@
-%%qt6%%
-!%%qt6%%
+@pkgpath net/libaccounts-qt,qt6
+@conflict libaccounts-qt6-<=1.17
+@bin bin/accountstest-qt6
+include/accounts-qt6/
+include/accounts-qt6/Accounts/
+include/accounts-qt6/Accounts/Account
+include/accounts-qt6/Accounts/AccountService
+include/accounts-qt6/Accounts/Application
+include/accounts-qt6/Accounts/AuthData
+include/accounts-qt6/Accounts/Error
+include/accounts-qt6/Accounts/Manager
+include/accounts-qt6/Accounts/Provider
+include/accounts-qt6/Accounts/Service
+include/accounts-qt6/Accounts/ServiceType
+include/accounts-qt6/Accounts/account-service.h
+include/accounts-qt6/Accounts/account.h
+include/accounts-qt6/Accounts/accountscommon.h
+include/accounts-qt6/Accounts/application.h
+include/accounts-qt6/Accounts/auth-data.h
+include/accounts-qt6/Accounts/error.h
+include/accounts-qt6/Accounts/manager.h
+include/accounts-qt6/Accounts/manager_p.h
+include/accounts-qt6/Accounts/provider.h
+include/accounts-qt6/Accounts/service-type.h
+include/accounts-qt6/Accounts/service.h
+include/accounts-qt6/Accounts/utils.h
+lib/cmake/AccountsQt6/
+lib/cmake/AccountsQt6/AccountsQt6Config.cmake
+lib/cmake/AccountsQt6/AccountsQt6ConfigVersion.cmake
+@lib lib/libaccounts-qt6.so.${LIBaccounts-qt6_VERSION}
+lib/pkgconfig/accounts-qt6.pc
diff --git a/x11/kde-applications/akonadi/Makefile
b/x11/kde-applications/akonadi/Makefile
index cc9e2237205..edf641ccc2d 100644
--- a/x11/kde-applications/akonadi/Makefile
+++ b/x11/kde-applications/akonadi/Makefile
@@ -1,7 +1,7 @@
COMMENT = PIM Storage Service
DISTNAME = akonadi-${VERSION}
CATEGORIES = databases productivity
-REVISION = 1
+REVISION = 2
HOMEPAGE = https://kontact.kde.org
@@ -57,7 +57,7 @@ LIB_DEPENDS = archivers/xz \
devel/kf6/kitemmodels \
devel/kf6/kwidgetsaddons \
devel/kf6/kxmlgui \
- net/libaccounts-qt,qt6 \
+ net/libaccounts-qt \
textproc/libxml \
x11/kde-applications/kf6-kaccounts-integration>=${VERSION}
diff --git a/x11/kde-applications/kaccounts-providers/Makefile
b/x11/kde-applications/kaccounts-providers/Makefile
index 7a3447a6a1a..73f638877ac 100644
--- a/x11/kde-applications/kaccounts-providers/Makefile
+++ b/x11/kde-applications/kaccounts-providers/Makefile
@@ -1,7 +1,7 @@
COMMENT = online account providers for the KAccounts system
DISTNAME = kaccounts-providers-${VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = net devel
@@ -23,7 +23,7 @@ LIB_DEPENDS = devel/kf6/kcoreaddons \
devel/kf6/kio \
devel/kf6/kpackage \
devel/qcoro \
- net/libaccounts-qt,qt6 \
+ net/libaccounts-qt \
x11/kde-applications/kf6-kaccounts-integration>=${VERSION} \
x11/qt6/qtdeclarative \
x11/qt6/qtpositioning \
diff --git a/x11/kde-applications/kf6-kaccounts-integration/Makefile
b/x11/kde-applications/kf6-kaccounts-integration/Makefile
index baef33b5335..108c5a441b5 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 = 0
+REVISION = 1
CATEGORIES = net devel
@@ -30,7 +30,7 @@ LIB_DEPENDS = devel/kf6/kcmutils \
devel/kf6/kwallet \
devel/kf6/kwidgetsaddons \
devel/qcoro \
- net/libaccounts-qt,qt6 \
+ net/libaccounts-qt \
net/signond-qt6 \
x11/qt6/qtdeclarative
diff --git a/x11/kde-applications/kio-gdrive/Makefile
b/x11/kde-applications/kio-gdrive/Makefile
index 3594cdcd67f..6fa88b30a78 100644
--- a/x11/kde-applications/kio-gdrive/Makefile
+++ b/x11/kde-applications/kio-gdrive/Makefile
@@ -1,6 +1,7 @@
COMMENT = KIO Slave to access Google Drive
DISTNAME = kio-gdrive-${VERSION}
CATEGORIES = www x11
+REVISION = 0
WANTLIB += ${COMPILER_LIBCXX} GL KF6Completion KF6ConfigCore KF6CoreAddons
WANTLIB += KF6I18n KF6JobWidgets KF6KIOCore KF6KIOGui KF6KIOWidgets
@@ -25,7 +26,7 @@ LIB_DEPENDS = devel/kf6/kcompletion \
devel/kf6/kjobwidgets \
devel/kf6/purpose \
devel/kf6/solid \
- net/libaccounts-qt,qt6 \
+ net/libaccounts-qt \
x11/kde-applications/kf6-kaccounts-integration>=${VERSION} \
x11/kde-applications/libkgapi>=${VERSION}
diff --git a/x11/kde-plasma/plasma-desktop/Makefile
b/x11/kde-plasma/plasma-desktop/Makefile
index 19f528a7900..f642aaab3a9 100644
--- a/x11/kde-plasma/plasma-desktop/Makefile
+++ b/x11/kde-plasma/plasma-desktop/Makefile
@@ -1,5 +1,6 @@
COMMENT = KDE tools and widgets for the desktop
DISTNAME = plasma-desktop-${VERSION}
+REVISION = 0
MODKDE_TRANSLATIONS = Yes
MODKDE_ICON_CACHE = Yes
@@ -75,7 +76,7 @@ LIB_DEPENDS = devel/kf6/attica \
devel/kf6/sonnet \
devel/sdl2 \
inputmethods/ibus \
- net/libaccounts-qt,qt6 \
+ net/libaccounts-qt \
textproc/icu4c \
x11/kde-applications/kf6-kaccounts-integration \
x11/kde-plasma/libksysguard>=${VERSION} \
