[neon/snap-packaging/kde-snap-akonadi/work.core24] /: Move to core24

Scarlett Moore null at kde.org
Tue Jan 28 12:12:02 GMT 2025


Git commit 53bc623bcf46cdc63ebb0fa0d24bbc3c852ace82 by Scarlett Moore.
Committed on 28/01/2025 at 12:11.
Pushed by scarlettmoore into branch 'work.core24'.

Move to core24

M  +47   -43   snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 04b02d5..5317640 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,16 +1,18 @@
 ---
 name: akonadi-sdk
-base: core22
+base: core24
 summary: KDE Akonadi data server for PIM applications
 description: KDE Akonadi data server for PIM applications shared dbus provider
 confinement: strict
 grade: stable
-version: 24.05
-architectures:
-  - build-on: amd64
-  # - build-on: arm64
-  # - build-on: armhf
-  # - build-on: ppc64el
+version: 24.12.1
+platforms:
+  amd64:
+    build-on: [amd64]
+    build-for: [amd64]
+  arm64:
+    build-on: [arm64]
+    build-for: [arm64]
 apps:
     akonadiserver:
         extensions:
@@ -22,7 +24,7 @@ package-repositories:
     components:
     - main
     suites:
-    - jammy
+    - noble
     key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
@@ -31,7 +33,7 @@ parts:
         plugin: qmake
         qmake-major-version: 6
         qmake-parameters:
-        - "ROOT_DIR+=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
+        - "ROOT_DIR+=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/usr"
         build-packages:
         - pkg-config
         - libaccounts-glib-dev
@@ -55,7 +57,7 @@ parts:
         plugin: qmake
         qmake-major-version: 6
         qmake-parameters:
-        - "ROOT_DIR+=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
+        - "ROOT_DIR+=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/usr"
         build-packages:
         - pkg-config
         - rsync
@@ -74,7 +76,7 @@ parts:
         - cmake
         - pkg-config
         source: https://invent.kde.org/network/kaccounts-integration.git
-        source-branch: release/24.05
+        source-branch: &branch release/24.12
         cmake-parameters: &cmakeparameters
         - -DCMAKE_INSTALL_PREFIX=/usr
         - -DCMAKE_BUILD_TYPE=Release
@@ -117,8 +119,9 @@ parts:
         - liblzma5
         - libxkbcommon0
         - libaccounts-glib0
+        - mariadb-client
         source: https://invent.kde.org/pim/akonadi.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kmime:
@@ -129,7 +132,7 @@ parts:
         - cmake
         - libboost-dev
         source: https://invent.kde.org/pim/kmime.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     akonadi-mime:
@@ -141,7 +144,7 @@ parts:
         - cmake
         - libxslt1-dev
         source: https://invent.kde.org/pim/akonadi-mime.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     akonadi-search:
@@ -158,7 +161,7 @@ parts:
         - libxapian30
         - xapian-tools
         source: https://invent.kde.org/pim/akonadi-search.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     grantlee-theme:
@@ -173,7 +176,7 @@ parts:
         - libgrantlee-templates5
         - libgrantlee-textdocument5
         source: https://invent.kde.org/pim/grantleetheme.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     ksmtp:
@@ -184,7 +187,7 @@ parts:
         - cmake
         - libsasl2-dev
         source: https://invent.kde.org/pim/ksmtp.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     libkgapi:
@@ -199,7 +202,7 @@ parts:
         - libsasl2-dev
         - libxml2-utils
         source: https://invent.kde.org/pim/libkgapi.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kmailtransport:
@@ -215,7 +218,7 @@ parts:
         - libsasl2-dev
         - pkg-config
         source: https://invent.kde.org/pim/kmailtransport.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kpimtextedit:
@@ -230,7 +233,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/kpimtextedit.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kidentitymanagement:
@@ -246,7 +249,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/kidentitymanagement.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kcalutils:
@@ -263,7 +266,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/kcalutils.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     akonadi-contact:
@@ -279,12 +282,12 @@ parts:
         plugin: cmake
         build-packages:
         - cmake
-        - libqgpgme-dev
+        - libqgpgmeqt6-dev
         stage-packages:
         - libgpgmepp6
-        - libqgpgme15
+        - libqgpgmeqt6-15
         source: https://invent.kde.org/pim/akonadi-contacts.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kimap:
@@ -303,7 +306,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/kimap.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kldap:
@@ -322,7 +325,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/kldap.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     libkdepim:
@@ -342,7 +345,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/libkdepim.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     pimcommon:
@@ -364,7 +367,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/pimcommon.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     gravatar:
@@ -383,7 +386,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/libgravatar.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     libkleo:
@@ -407,13 +410,13 @@ parts:
         - libgpgmepp-dev
         - libgpgme-dev
         - libqgpgme-dev
-        - libqgpgme15-qt6-dev
+        - libqgpgmeqt6-dev
         stage-packages:
         - libgpgme11
         - libgpgmepp6
-        - libqgpgme15-qt6
+        - libqgpgmeqt6-15
         source: https://invent.kde.org/pim/libkleo.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     kmbox:
@@ -434,7 +437,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/kmbox.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     qca:
@@ -474,8 +477,8 @@ parts:
         - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
         - --log-level=STATUS
         - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-        - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
-        - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
+        - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/usr"
+        - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/usr"
         prime: *prime
         override-stage: |
             craftctl default
@@ -500,7 +503,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/messagelib.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     akonadi-notes:
@@ -518,7 +521,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/akonadi-notes.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     calendarsupport:
@@ -542,7 +545,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/calendarsupport.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     akonadi-calendar:
@@ -560,12 +563,13 @@ parts:
         plugin: cmake
         build-packages:
         - cmake
-        - libqgpgme15-qt6-dev
+        - libqgpgmeqt6-dev
+        - libpulse0
         stage-packages:
         - libgpgmepp6
-        - libqgpgme15-qt6
+        - libqgpgmeqt6-15
         source: https://invent.kde.org/pim/akonadi-calendar.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
         override-stage: |
@@ -587,7 +591,7 @@ parts:
         build-packages:
         - cmake
         source: https://invent.kde.org/pim/kontactinterface.git
-        source-branch: release/24.05
+        source-branch: *branch
         cmake-parameters: *cmakeparameters
         prime: *prime
     fix_pc_files:


More information about the Neon-commits mailing list