sysutils/accounts-qml-module: update to the latest commit and switch to Qt6

Remove stale patch.

4 files changed, 30 insertions, 41 deletions

diff --git a/sysutils/accounts-qml-module/Makefile b/sysutils/accounts-qml-module/Makefile
index bb7a91830f30..9ebbee43ee92 100644
--- a/sysutils/accounts-qml-module/Makefile
+++ b/sysutils/accounts-qml-module/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	accounts-qml-module
 DISTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils kde
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
 
@@ -11,16 +11,16 @@ WWW=		https://gitlab.com/groups/accounts-sso
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \
-		libsignon-qt5.so:sysutils/signond@qt5
+LIB_DEPENDS=	libaccounts-qt6.so:net-im/libaccounts-qt@qt6 \
+		libsignon-qt6.so:sysutils/signond@qt6
 
-USES=		compiler:c++11-lang gl pkgconfig qmake qt:5 tar:bz2
+USES=		compiler:c++17-lang gl pkgconfig qmake qt:6 tar:bz2
 USE_GL=		gl
-USE_QT=		core declarative gui network testlib xml \
-		buildtools:build qdoc:build qmake:build
+USE_QT=		base declarative \
+		tools:build
 # gitlab variables
 USE_GITLAB=	yes
 GL_ACCOUNT=	accounts-sso
-GL_TAGNAME=	cfadea7ba8ba4011ae20d771696eb74deb87201e
+GL_TAGNAME=	05e79ebbbf3784a87f72b7be571070125c10dfe3
 
 .include <bsd.port.mk>
diff --git a/sysutils/accounts-qml-module/distinfo b/sysutils/accounts-qml-module/distinfo
index f7c836fb8159..9f406efbd679 100644
--- a/sysutils/accounts-qml-module/distinfo
+++ b/sysutils/accounts-qml-module/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617892301
-SHA256 (KDE/accounts-sso/accounts-sso-accounts-qml-module-cfadea7ba8ba4011ae20d771696eb74deb87201e_GL0.tar.gz) = 1d0039c047f1f0fba9191edfe3295a22b0d71533b7ac99e9bf28d1f068e97e98
-SIZE (KDE/accounts-sso/accounts-sso-accounts-qml-module-cfadea7ba8ba4011ae20d771696eb74deb87201e_GL0.tar.gz) = 62041
+TIMESTAMP = 1742251106
+SHA256 (KDE/accounts-sso/accounts-sso-accounts-qml-module-05e79ebbbf3784a87f72b7be571070125c10dfe3_GL0.tar.gz) = 1a53a6d8a3a56694244bc24bdab844d91420483744822d08ae8517ff7df84763
+SIZE (KDE/accounts-sso/accounts-sso-accounts-qml-module-05e79ebbbf3784a87f72b7be571070125c10dfe3_GL0.tar.gz) = 62088
diff --git a/sysutils/accounts-qml-module/files/patch-common-project-config.pri b/sysutils/accounts-qml-module/files/patch-common-project-config.pri
deleted file mode 100644
index da1103f137d8..000000000000
--- a/sysutils/accounts-qml-module/files/patch-common-project-config.pri
+++ /dev/null
@@ -1,11 +0,0 @@
---- common-project-config.pri.orig	2020-04-25 09:29:07 UTC
-+++ common-project-config.pri
-@@ -3,7 +3,7 @@
- #-----------------------------------------------------------------------------
- 
- # we don't like warnings...
--QMAKE_CXXFLAGS += -Werror -Wno-write-strings
-+QMAKE_CXXFLAGS += -Wno-write-strings
- # Disable RTTI
- QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
- # Use C++11
diff --git a/sysutils/accounts-qml-module/pkg-plist b/sysutils/accounts-qml-module/pkg-plist
index 29a0e9e0e609..20ecac37adb4 100644
--- a/sysutils/accounts-qml-module/pkg-plist
+++ b/sysutils/accounts-qml-module/pkg-plist
@@ -1,25 +1,25 @@
 bin/tst_plugin
-%%QT_QMLDIR%%/Ubuntu/OnlineAccounts/libAccounts.so
-%%QT_QMLDIR%%/Ubuntu/OnlineAccounts/plugin.qmltypes
-%%QT_QMLDIR%%/Ubuntu/OnlineAccounts/qmldir
+%%QT_QMLDIR%%/SSO/OnlineAccounts/libAccounts.so
+%%QT_QMLDIR%%/SSO/OnlineAccounts/plugin.qmltypes
+%%QT_QMLDIR%%/SSO/OnlineAccounts/qmldir
 %%DATADIR%%/doc/html/.gitignore
 %%DATADIR%%/doc/html/onlineaccounts-qml-api.index
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-account-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-account.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservice-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservice.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservicemodel-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservicemodel.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-application-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-application.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-applicationmodel-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-applicationmodel.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-credentials-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-credentials.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-manager-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-manager.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-providermodel-members.html
-%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-providermodel.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-account-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-account.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-accountservice-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-accountservice.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-accountservicemodel-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-accountservicemodel.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-application-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-application.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-applicationmodel-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-applicationmodel.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-credentials-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-credentials.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-manager-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-manager.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-providermodel-members.html
+%%DATADIR%%/doc/html/qml-sso-onlineaccounts-providermodel.html
+%%DATADIR%%/doc/html/sso-onlineaccounts-qmlmodule.html
 %%DATADIR%%/doc/html/style/qtquick.css
-%%DATADIR%%/doc/html/ubuntu-onlineaccounts-qmlmodule.html
 @dir %%DATADIR%%/doc/html/images