After the diff, kf6-kaccounts-integration will have the PKGNAME
kf6-kaccounts-integration-24.02.1p1 so the version number is
considered a valid update from kaccounts-integration-24.02.1p0,
so that part is alright.
In x11/kde-applications/kf6-kaccounts-integration/pkg/PLIST
you'll need this so that it is treated as an update candidate:
@pkgpath x11/kde-applications/kaccounts-integration
With that it's OK sthen
On 2024/05/30 08:55, Rafael Sadowski wrote:
> Stuart has asked if we can get rid of kaccounts-integration (kf5).
>
> I had left it in so as not to lose support in kf5/purpose. However,
> purpose is only used by kdevleop. I think that's fine.
>
> Here is a diff that tries to clear up the nonsense with kf5 and kf6
> kaccounts-integration.
>
> - Remove kaccounts-integration (kf5) support in purpose.
> - Remove kaccounts-integration (kf5) from meta/kde
> - Unhook kaccounts-integration (kf5)
> - Add update path in quirks
> - +@conflict kaccounts-integration-* in kf6
>
> Thanks Stuart for the idea and taking care of it.
>
> Input, ok?
>
> Rafael
>
> Index: devel/kf5/purpose/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/kf5/purpose/Makefile,v
> diff -u -p -r1.26 Makefile
> --- devel/kf5/purpose/Makefile 21 May 2024 13:35:51 -0000 1.26
> +++ devel/kf5/purpose/Makefile 30 May 2024 06:48:07 -0000
> @@ -1,5 +1,6 @@
> COMMENT = framework to create integrate services and actions
> DISTNAME = purpose-${VERSION}
> +REVISION = 0
>
> SHARED_LIBS += KF5Purpose 3.0
> SHARED_LIBS += KF5PurposeWidgets 2.0
> @@ -10,8 +11,7 @@ WANTLIB += ${COMPILER_LIBCXX} KF5Complet
> WANTLIB += KF5I18n KF5JobWidgets KF5KIOCore KF5KIOGui KF5KIOWidgets
> WANTLIB += KF5Notifications KF5Service KF5Solid KF5WidgetsAddons
> WANTLIB += KF5WindowSystem Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
> -WANTLIB += Qt5Network Qt5Qml Qt5Widgets Qt5Xml X11 accounts-qt5
> -WANTLIB += c kaccounts m
> +WANTLIB += Qt5Network Qt5Qml Qt5Widgets X11 c m
>
> # Special case, KAccounts depends on intltool-merge
> MODULES += textproc/intltool
> @@ -38,8 +38,7 @@ LIB_DEPENDS = devel/kf5/kcompletion>=${M
> devel/kf5/solid>=${MODKF5_VERSION} \
> x11/qt5/qtdeclarative
>
> -LIB_DEPENDS += net/libaccounts-qt \
> - x11/kde-applications/kaccounts-integration
> +CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_KAccounts=ON
>
> # sucks
> TEST_IS_INTERACTIVE = X11
> Index: devel/kf5/purpose/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/kf5/purpose/pkg/PLIST,v
> diff -u -p -r1.28 PLIST
> --- devel/kf5/purpose/pkg/PLIST 21 May 2024 13:35:51 -0000 1.28
> +++ devel/kf5/purpose/pkg/PLIST 30 May 2024 06:48:07 -0000
> @@ -41,14 +41,12 @@ lib/qt5/plugins/kf5/purpose/
> @so lib/qt5/plugins/kf5/purpose/kdeconnectplugin.so
> @so lib/qt5/plugins/kf5/purpose/kdeconnectsmsplugin.so
> @so lib/qt5/plugins/kf5/purpose/ktpsendfileplugin.so
> -@so lib/qt5/plugins/kf5/purpose/nextcloudplugin.so
> @so lib/qt5/plugins/kf5/purpose/pastebinplugin.so
> @so lib/qt5/plugins/kf5/purpose/phabricatorplugin.so
> @so lib/qt5/plugins/kf5/purpose/reviewboardplugin.so
> @so lib/qt5/plugins/kf5/purpose/saveasplugin.so
> @so lib/qt5/plugins/kf5/purpose/telegramplugin.so
> @so lib/qt5/plugins/kf5/purpose/twitterplugin.so
> -@so lib/qt5/plugins/kf5/purpose/youtubeplugin.so
> lib/qt5/qml/org/kde/purpose/
> lib/qt5/qml/org/kde/purpose/AlternativesView.qml
> lib/qt5/qml/org/kde/purpose/JobView.qml
> @@ -61,20 +59,12 @@ lib/qt5/qml/org/kde/purpose/reviewboard/
> @so lib/qt5/qml/org/kde/purpose/reviewboard/librbpurposequickplugin.so
> lib/qt5/qml/org/kde/purpose/reviewboard/qmldir
> @bin libexec/kf5/purposeprocess
> -share/accounts/
> -share/accounts/services/
> -share/accounts/services/kde/
> @comment share/accounts/services/kde/google-youtube.service
> @comment share/accounts/services/kde/nextcloud-upload.service
> share/icons/hicolor/128x128/apps/phabricator-purpose.png
> share/icons/hicolor/128x128/apps/reviewboard-purpose.png
> -share/icons/hicolor/16x16/actions/kipiplugin_youtube.png
> share/icons/hicolor/16x16/apps/phabricator-purpose.png
> share/icons/hicolor/16x16/apps/reviewboard-purpose.png
> -share/icons/hicolor/22x22/actions/kipiplugin_youtube.png
> -share/icons/hicolor/32x32/actions/kipiplugin_youtube.png
> -share/icons/hicolor/48x48/actions/kipiplugin_youtube.png
> -share/icons/hicolor/64x64/actions/kipiplugin_youtube.png
> share/locale/ar/LC_MESSAGES/libpurpose_quick.mo
> share/locale/ar/LC_MESSAGES/libpurpose_widgets.mo
> share/locale/ar/LC_MESSAGES/purpose-fileitemaction.mo
> @@ -696,11 +686,9 @@ share/locale/zh_TW/LC_MESSAGES/purpose_y
> share/purpose/
> share/purpose/barcodeplugin_config.qml
> share/purpose/kdeconnectplugin_config.qml
> -share/purpose/nextcloudplugin_config.qml
> share/purpose/phabricatorplugin_config.qml
> share/purpose/reviewboardplugin_config.qml
> share/purpose/saveasplugin_config.qml
> -share/purpose/youtubeplugin_config.qml
> share/qlogging-categories5/purpose.categories
> @tag gtk-update-icon-cache %D/share/icons/hicolor
> share/qlogging-categories5/purpose.renamecategories
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> diff -u -p -r1.1624 Makefile
> --- devel/quirks/Makefile 29 May 2024 06:55:10 -0000 1.1624
> +++ devel/quirks/Makefile 30 May 2024 06:48:18 -0000
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-7.32
> +PKGNAME = quirks-7.33
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> diff -u -p -r1.1636 Quirks.pm
> --- devel/quirks/files/Quirks.pm 29 May 2024 06:55:10 -0000 1.1636
> +++ devel/quirks/files/Quirks.pm 30 May 2024 06:48:18 -0000
> @@ -833,6 +833,8 @@ my $stem_extensions = {
> 'systemsettings-kf5' => 'kf6-systemsettings',
> 'libkscreen-kf5' => 'kf6-libkscreen',
> 'kdeplasma-addons-kf5' => 'kf6-kdeplasma-addons',
> + 'kdeplasma-addons-kf5' => 'kf6-kdeplasma-addons',
> + 'kaccounts-integration' => 'kf6-kaccounts-integration',
> };
>
> my $obsolete_reason = {};
> Index: meta/kde/Makefile
> ===================================================================
> RCS file: /cvs/ports/meta/kde/Makefile,v
> diff -u -p -r1.21 Makefile
> --- meta/kde/Makefile 26 May 2024 10:42:28 -0000 1.21
> +++ meta/kde/Makefile 30 May 2024 06:48:41 -0000
> @@ -31,6 +31,8 @@ PLASMA_VERSION = 6.0.5
> PKGNAME-plasma = kde-plasma-${PLASMA_VERSION}
> PKGNAME-plasma-extras = kde-plasma-extras-${PLASMA_VERSION}
>
> +REVISION = 0
> +REVISION-development = 0
> REVISION-plasma = 1
> REVISION-graphics = 1
> REVISION-plasma-extras = 0
> @@ -332,7 +334,6 @@ RUN_DEPENDS-development = \
> RUN_DEPENDS-development += \
> x11/kde-applications/okteta \
> x11/kde-applications/signon-kwallet-extension \
> - x11/kde-applications/kaccounts-integration \
> x11/kde-applications/kaccounts-providers
>
> # Not yet ported
> Index: x11/kde-applications/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde-applications/Makefile,v
> diff -u -p -r1.87 Makefile
> --- x11/kde-applications/Makefile 20 May 2024 07:35:23 -0000 1.87
> +++ x11/kde-applications/Makefile 30 May 2024 06:49:20 -0000
> @@ -249,7 +249,6 @@
> SUBDIR += libkdcraw
> SUBDIR += kf6-libkdcraw
>
> - SUBDIR += kaccounts-integration
> SUBDIR += kf6-kaccounts-integration
>
> # libkgapi still needs a Qt 5 version for kio-gdrive and a Qt 6 version
> Index: x11/kde-applications/kf6-kaccounts-integration/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde-applications/kf6-kaccounts-integration/Makefile,v
> diff -u -p -r1.4 Makefile
> --- x11/kde-applications/kf6-kaccounts-integration/Makefile 27 May 2024
> 17:46:21 -0000 1.4
> +++ x11/kde-applications/kf6-kaccounts-integration/Makefile 30 May 2024
> 06:49:21 -0000
> @@ -2,7 +2,7 @@ COMMENT = library and QML module for Acc
>
> DISTNAME = kaccounts-integration-${VERSION}
> PKGNAME = kf6-kaccounts-integration-${VERSION}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = net devel
>
> Index: x11/kde-applications/kf6-kaccounts-integration/pkg/PLIST
> ===================================================================
> RCS file:
> /cvs/ports/x11/kde-applications/kf6-kaccounts-integration/pkg/PLIST,v
> diff -u -p -r1.2 PLIST
> --- x11/kde-applications/kf6-kaccounts-integration/pkg/PLIST 27 May 2024
> 17:46:21 -0000 1.2
> +++ x11/kde-applications/kf6-kaccounts-integration/pkg/PLIST 30 May 2024
> 06:49:21 -0000
> @@ -1,4 +1,4 @@
> -@conflict kaccounts-integration-<24.02.1p0
> +@conflict kaccounts-integration-*
> include/KAccounts6/
> include/KAccounts6/KAccounts/
> include/KAccounts6/KAccounts/AccountServiceToggleJob
>
