[neon/snap-packaging/kde-snap-akonadi/work.core24] /: Fix formatting, build libgpgmepp-qt6

Scarlett Moore null at kde.org
Wed Jun 25 10:38:05 BST 2025


Git commit 3c3c0a0dbbe019a1957fa79bfb7abab4ce1bb658 by Scarlett Moore.
Committed on 25/06/2025 at 09:36.
Pushed by scarlettmoore into branch 'work.core24'.

Fix formatting, build libgpgmepp-qt6

M  +262  -255  snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 6640f16..208d990 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -279,13 +279,12 @@ parts:
       - kmailtransport
       - kidentitymanagement
       - kcalutils
+      - libgpgmepp-qt6
     plugin: cmake
     build-packages:
       - cmake
-      - libqgpgmeqt6-dev
     stage-packages:
       - libgpgmepp6
-      - libqgpgmeqt6-15
     source: https://invent.kde.org/pim/akonadi-contacts.git
     source-branch: *branch
     cmake-parameters: *cmakeparameters
@@ -353,256 +352,264 @@ parts:
     build-environment: *buildenvironment
     prime: *prime
   pimcommon:
-        after:
-        - akonadi
-        - akonadi-mime
-        - kmime
-        - ksmtp
-        - libkgapi
-        - kmailtransport
-        - kpimtextedit
-        - kidentitymanagement
-        - kcalutils
-        - akonadi-contact
-        - kimap
-        - kldap
-        - libkdepim
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/pim/pimcommon.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    gravatar:
-        after:
-        - akonadi
-        - akonadi-mime
-        - kmime
-        - ksmtp
-        - libkgapi
-        - kmailtransport
-        - kpimtextedit
-        - kidentitymanagement
-        - kcalutils
-        - pimcommon
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/pim/libgravatar.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    libkleo:
-        after:
-        - akonadi
-        - akonadi-mime
-        - kmime
-        - ksmtp
-        - libkgapi
-        - kmailtransport
-        - kpimtextedit
-        - kidentitymanagement
-        - kcalutils
-        - pimcommon
-        - gravatar
-        plugin: cmake
-        build-packages:
-        - cmake
-        - libboost-dev
-        - libgpg-error-dev
-        - libgpgmepp-dev
-        - libgpgme-dev
-        - libqgpgme-dev
-        - libqgpgmeqt6-dev
-        stage-packages:
-        - libgpgme11
-        - libgpgmepp6
-        - libqgpgmeqt6-15
-        source: https://invent.kde.org/pim/libkleo.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    kmbox:
-        after:
-        - akonadi
-        - akonadi-mime
-        - kmime
-        - ksmtp
-        - libkgapi
-        - kmailtransport
-        - kpimtextedit
-        - kidentitymanagement
-        - kcalutils
-        - pimcommon
-        - gravatar
-        - libkleo
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/pim/kmbox.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    qca:
-        plugin: cmake
-        build-packages:
-        - cmake
-        - ca-certificates
-        - gnupg
-        - libsasl2-dev
-        - libssl-dev
-        - pkg-config
-        - rsync
-        source: https://invent.kde.org/libraries/qca.git
-        source-branch: master
-        cmake-parameters:
-        - -DLIB_SUFFIX="/$(CRAFT_ARCH_TRIPLET_BUILD_FOR)"
-        - -DWITH_botan_PLUGIN=NO
-        - -DWITH_gcrypt_PLUGIN=NO
-        - -DWITH_nss_PLUGIN=NO
-        - -DWITH_pkcs11_PLUGIN=NO
-        - -DBUILD_WITH_QT6=ON
-        - -DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(CRAFT_ARCH_TRIPLET_BUILD_FOR)/qt6/mkspecs/features"
-        - -DCMAKE_INSTALL_PREFIX=/usr
-        - -DCMAKE_BUILD_TYPE=Release
-        - -DQT_MAJOR_VERSION=6
-        - -DBUILD_WITH_QT6=ON
-        - -DBUILD_TESTING=OFF
-        - -DBUILD_KWALLETD=OFF
-        - -DCMAKE_INSTALL_SYSCONFDIR=/etc
-        - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-        - -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
-        - -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF
-        - -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON
-        - -DCMAKE_INSTALL_RUNSTATEDIR=/run
-        - -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON
-        - -DCMAKE_VERBOSE_MAKEFILE=ON
-        - -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-core24-sdk/current\\;/usr"
-        - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/usr"
-        prime: *prime
-        override-stage: |
-            craftctl default
-            rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
-    messagelib:
-        after:
-        - akonadi
-        - akonadi-mime
-        - kmime
-        - ksmtp
-        - libkgapi
-        - kmailtransport
-        - kpimtextedit
-        - kidentitymanagement
-        - kcalutils
-        - akonadi-contact
-        - gravatar
-        - libkleo
-        - kmbox
-        - qca
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/pim/messagelib.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    akonadi-notes:
-        after:
-        - akonadi
-        - akonadi-mime
-        - akonadi-contact
-        - akonadi-search
-        - ksmtp
-        - kmailtransport
-        - kidentitymanagement
-        - kcalutils
-        - messagelib
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/pim/akonadi-notes.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    calendarsupport:
-        after:
-        - akonadi
-        - akonadi-mime
-        - akonadi-calendar
-        - akonadi-notes
-        - kmime
-        - ksmtp
-        - libkgapi
-        - kmailtransport
-        - kpimtextedit
-        - kidentitymanagement
-        - kcalutils
-        - akonadi-contact
-        - gravatar
-        - libkleo
-        - kmbox
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/pim/calendarsupport.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    akonadi-calendar:
-        after:
-        - akonadi
-        - akonadi-mime
-        - akonadi-contact
-        - akonadi-search
-        - ksmtp
-        - kmailtransport
-        - kidentitymanagement
-        - kcalutils
-        - messagelib
-        - qca
-        plugin: cmake
-        build-packages:
-        - cmake
-        - libqgpgmeqt6-dev
-        - libpulse0
-        stage-packages:
-        - libgpgmepp6
-        - libqgpgmeqt6-15
-        source: https://invent.kde.org/pim/akonadi-calendar.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-        override-stage: |
-            craftctl default
-            rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
-    kontactinterface:
-        after:
-        - akonadi
-        - akonadi-mime
-        - akonadi-contact
-        - akonadi-search
-        - ksmtp
-        - kmailtransport
-        - kidentitymanagement
-        - kcalutils
-        - messagelib
-        - qca
-        plugin: cmake
-        build-packages:
-        - cmake
-        source: https://invent.kde.org/pim/kontactinterface.git
-        source-branch: *branch
-        cmake-parameters: *cmakeparameters
-        prime: *prime
-    fix_pc_files:
-        after:
-        - akonadi-calendar
-        plugin: nil
-        override-stage: |
-            craftctl default
-            find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:/root/stage:/snap/$CRAFT_PROJECT_NAME/current:g' {}*" \;
-
+    after:
+      - akonadi
+      - akonadi-mime
+      - kmime
+      - ksmtp
+      - libkgapi
+      - kmailtransport
+      - kpimtextedit
+      - kidentitymanagement
+      - kcalutils
+      - akonadi-contact
+      - kimap
+      - kldap
+      - libkdepim
+    plugin: cmake
+    build-packages:
+      - cmake
+    source: https://invent.kde.org/pim/pimcommon.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  gravatar:
+    after:
+      - akonadi
+      - akonadi-mime
+      - kmime
+      - ksmtp
+      - libkgapi
+      - kmailtransport
+      - kpimtextedit
+      - kidentitymanagement
+      - kcalutils
+      - pimcommon
+    plugin: cmake
+    build-packages:
+      - cmake
+    source: https://invent.kde.org/pim/libgravatar.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  libgpgmepp-qt6:
+    build-packages:
+      - libassuan-dev
+      - libgpg-error-dev
+      - rsync
+    stage-packages:
+      - libassuan0
+      - libgpg-error0
+    source: https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.23.2.tar.bz2
+    source-checksum: sha256/9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
+    plugin: autotools
+    autotools-configure-parameters:
+      - --disable-gpgsm-test
+      - --enable-languages=cpp,qt6
+      - --prefix=/usr
+      - --enable-fixed-path=/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+    build-environment: &buildenvironment
+      - LD_LIBRARY_PATH: $LD_LIBRARY_PATH:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:/snap/kf6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/usr
+      - PKG_CONFIG_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
+    override-build: |
+      craftctl default
+      rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
+  libkleo:
+    after:
+      - akonadi
+      - akonadi-mime
+      - kmime
+      - ksmtp
+      - libkgapi
+      - kmailtransport
+      - kpimtextedit
+      - kidentitymanagement
+      - kcalutils
+      - pimcommon
+      - gravatar
+      - libgpgmepp-qt6
+    plugin: cmake
+    build-packages:
+      - cmake
+      - libboost-dev
+      - libgpg-error-dev
+      - libgpgmepp-dev
+      - libgpgme-dev
+      - libqgpgme-dev
+    stage-packages:
+      - libgpgme11
+      - libgpgmepp6
+    source: https://invent.kde.org/pim/libkleo.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  kmbox:
+    after:
+      - akonadi
+      - akonadi-mime
+      - kmime
+      - ksmtp
+      - libkgapi
+      - kmailtransport
+      - kpimtextedit
+      - kidentitymanagement
+      - kcalutils
+      - pimcommon
+      - gravatar
+      - libkleo
+    plugin: cmake
+    build-packages:
+      - cmake
+    source: https://invent.kde.org/pim/kmbox.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  qca:
+    plugin: cmake
+    build-packages:
+      - cmake
+      - ca-certificates
+      - gnupg
+      - libsasl2-dev
+      - libssl-dev
+      - pkg-config
+      - rsync
+    source: https://invent.kde.org/libraries/qca.git
+    source-branch: master
+    cmake-parameters:
+      - -DLIB_SUFFIX="/$(CRAFT_ARCH_TRIPLET_BUILD_FOR)"
+      - -DWITH_botan_PLUGIN=NO
+      - -DWITH_gcrypt_PLUGIN=NO
+      - -DWITH_nss_PLUGIN=NO
+      - -DWITH_pkcs11_PLUGIN=NO
+      - -DBUILD_WITH_QT6=ON
+      - -DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(CRAFT_ARCH_TRIPLET_BUILD_FOR)/qt6/mkspecs/features"
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DQT_MAJOR_VERSION=6
+      - -DBUILD_WITH_QT6=ON
+      - -DBUILD_TESTING=OFF
+      - -DBUILD_KWALLETD=OFF
+      - "-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
+          rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
+  messagelib:
+    after:
+      - akonadi
+      - akonadi-mime
+      - kmime
+      - ksmtp
+      - libkgapi
+      - kmailtransport
+      - kpimtextedit
+      - kidentitymanagement
+      - kcalutils
+      - akonadi-contact
+      - gravatar
+      - libkleo
+      - kmbox
+      - qca
+    plugin: cmake
+    build-packages:
+      - cmake
+    source: https://invent.kde.org/pim/messagelib.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  akonadi-notes:
+    after:
+      - akonadi
+      - akonadi-mime
+      - akonadi-contact
+      - akonadi-search
+      - ksmtp
+      - kmailtransport
+      - kidentitymanagement
+      - kcalutils
+      - messagelib
+    plugin: cmake
+    build-packages:
+      - cmake
+    source: https://invent.kde.org/pim/akonadi-notes.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  calendarsupport:
+    after:
+      - akonadi
+      - akonadi-mime
+      - akonadi-calendar
+      - akonadi-notes
+      - kmime
+      - ksmtp
+      - libkgapi
+      - kmailtransport
+      - kpimtextedit
+      - kidentitymanagement
+      - kcalutils
+      - akonadi-contact
+      - gravatar
+      - libkleo
+      - kmbox
+    plugin: cmake
+    build-packages:
+      - cmake
+    source: https://invent.kde.org/pim/calendarsupport.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  akonadi-calendar:
+    after:
+      - akonadi
+      - akonadi-mime
+      - akonadi-contact
+      - akonadi-search
+      - ksmtp
+      - kmailtransport
+      - kidentitymanagement
+      - kcalutils
+      - messagelib
+      - qca
+      - libgpgmepp-qt6
+    plugin: cmake
+    build-packages:
+      - cmake
+      - libpulse0
+    stage-packages:
+      - libgpgmepp6
+    source: https://invent.kde.org/pim/akonadi-calendar.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+    override-stage: |
+        craftctl default
+        rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
+  kontactinterface:
+    after:
+      - akonadi
+      - akonadi-mime
+      - akonadi-contact
+      - akonadi-search
+      - ksmtp
+      - kmailtransport
+      - kidentitymanagement
+      - kcalutils
+      - messagelib
+      - qca
+    plugin: cmake
+    build-packages:
+      - cmake
+    source: https://invent.kde.org/pim/kontactinterface.git
+    source-branch: *branch
+    cmake-parameters: *cmakeparameters
+    prime: *prime
+  fix_pc_files:
+    after:
+      - akonadi-calendar
+    plugin: nil
+    override-stage: |
+        craftctl default
+        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:/root/stage:/snap/$CRAFT_PROJECT_NAME/current:g' {}*" \;


More information about the Neon-commits mailing list