[neon/snap-packaging/kde-snap-akonadi] /: Add libaccounts-qt6 and signond, remove ktextaddons.

[Scarlett Moore]

Git commit e1d058c5c6568af76f3acb372369a851e898b416 by Scarlett Moore.
Committed on 24/04/2024 at 16:10.
Pushed by scarlettmoore into branch 'master'.

Add libaccounts-qt6 and signond, remove ktextaddons.

M  +45   -39   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-snap-akonadi/-/commit/e1d058c5c6568af76f3acb372369a851e898b416

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2aa6f05..8f9a25c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -48,16 +48,55 @@ package-repositories:
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
+    libaccounts-qt6:
+        plugin: qmake
+        qmake-major-version: 6
+        qmake-parameters:
+        - "ROOT_DIR+=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
+        build-packages:
+        - pkg-config
+        - libaccounts-glib-dev
+        - libglib2.0-dev
+        - rsync
+        source: https://gitlab.com/accounts-sso/libaccounts-qt.git
+        source-branch: master
+        prime: &prime
+        - "-usr/lib/*/cmake/*"
+        - "-usr/include/*"
+        - "-usr/share/ECM/*"
+        - "-usr/share/doc/*"
+        - "-usr/share/man/*"
+        - "-usr/share/icons/breeze-dark*"
+        - "-usr/bin/X11"
+        - "-usr/lib/gcc/$CRAFT_ARCH_TRIPLET_BUILD_FOR/6.0.0"
+        - "-usr/lib/aspell/*"
+        override-stage: |
+            craftctl default
+            rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
+    signond:
+        after:
+        - libaccounts-qt6
+        plugin: qmake
+        qmake-major-version: 6
+        qmake-parameters:
+        - "ROOT_DIR+=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
+        build-packages:
+        - pkg-config
+        - rsync
+        source: https://gitlab.com/nicolasfella/signond.git
+        source-branch: qt6
+        prime: *prime
+        override-stage: |
+            craftctl default
+            rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
     kaccounts-integration:
+        after:
+        - libaccounts-qt6
+        - signond
         plugin: cmake
         build-packages:
         - cmake
-        # - libaccounts-glib-dev
-        # - libaccounts-qt6-dev
-        - libsignon-qt6-dev
         - pkg-config
-        stage-packages:
-        - libsignon-qt6-1
         source: https://invent.kde.org/network/kaccounts-integration.git
         source-branch: release/24.05
         cmake-parameters: &cmakeparameters
@@ -78,16 +117,7 @@ parts:
         - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
         - --log-level=STATUS
         - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-        prime: &prime
-        - "-usr/lib/*/cmake/*"
-        - "-usr/include/*"
-        - "-usr/share/ECM/*"
-        - "-usr/share/doc/*"
-        - "-usr/share/man/*"
-        - "-usr/share/icons/breeze-dark*"
-        - "-usr/bin/X11"
-        - "-usr/lib/gcc/$CRAFT_ARCH_TRIPLET_BUILD_FOR/6.0.0"
-        - "-usr/lib/aspell/*"
+        prime: *prime
     akonadi:
         after:
         - kaccounts-integration
@@ -97,7 +127,6 @@ parts:
         - libxkbcommon-dev
         - libvulkan-dev
         - libaccounts-glib-dev
-        - libaccounts-qt6-dev
         - libboost-dev
         - liblzma-dev
         - libsqlite3-dev
@@ -111,7 +140,6 @@ parts:
         - libxml2
         - liblzma5
         - libxkbcommon0
-        - libaccounts-qt6-1
         - libaccounts-glib0
         source: https://invent.kde.org/pim/akonadi.git
         source-branch: release/24.05
@@ -341,27 +369,6 @@ parts:
         source-branch: release/24.05
         cmake-parameters: *cmakeparameters
         prime: *prime
-    ktextaddons:
-        after:
-        - akonadi
-        - akonadi-mime
-        - kmime
-        - ksmtp
-        - libkgapi
-        - kmailtransport
-        - kpimtextedit
-        - kidentitymanagement
-        - kcalutils
-        - akonadi-contact
-        - kldap
-        - libkdepim
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/libraries/ktextaddons.git
-        source-branch: '1.5'
-        cmake-parameters: *cmakeparameters
-        prime: *prime
     pimcommon:
         after:
         - akonadi
@@ -377,7 +384,6 @@ parts:
         - kimap
         - kldap
         - libkdepim
-        - ktextaddons
         plugin: cmake
         build-packages:
         - cmake