[neon/snap-packaging/kf6-snap] /: Fix libpoppler build.

Benjamin Port null at kde.org
Fri Apr 19 18:49:48 BST 2024


Git commit abbd947c784817d4d74c3c71ef9d73fc0452cf5c by Benjamin Port, on behalf of Scarlett Moore.
Committed on 19/04/2024 at 17:49.
Pushed by bport into branch 'master'.

Fix libpoppler build.

M  +23   -5    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-snap/-/commit/abbd947c784817d4d74c3c71ef9d73fc0452cf5c

diff --git a/snapcraft.yaml b/snapcraft.yaml
index ef1b0c4..30a7872 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -872,18 +872,31 @@ parts:
         - --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_PREFIX_PATH=$CRAFT_STAGE\\;../parts/libgpgmepp-qt6/install/\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
         build-environment: *buildenvironment
+    packagekit:
+        after:
+        - qtconf
+        source: "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.2.8.tar.xz"
+        source-checksum: sha256/d834250a0f121483027db2cfd93e8b2cba8dc48ff854395bfd88aa9511898be4
+        plugin: meson
+        build-packages:
+        - meson
+        - libgirepository1.0-dev
+        - valac
+        - xsltproc
+        - libgstreamermm-1.0-dev
+        - bash-completion
+        - ninja-build
+        build-snaps:
+        - kde-qt6-core22-sdk
     packagekit-qt6:
         after:
         - qtconf
+        - packagekit
         source: "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-Qt-1.1.1.tar.xz"
         source-checksum: sha256/8ad57523dbfd5a4b2086fa420b8ded63024e12efb8ca0ac42db767842e506212
         plugin: cmake
-#        build-packages:
-#        - packagekit-dev
-#        stage-packages:
-#        - packagekit
         build-snaps:
         - kde-qt6-core22-sdk
         cmake-generator: Ninja
@@ -923,6 +936,7 @@ parts:
         build-packages:
         - libassuan-dev
         - libgpg-error-dev
+        - rsync
         stage-packages:
         - libassuan0
         - libgpg-error0
@@ -932,7 +946,11 @@ parts:
         autotools-configure-parameters:
         - --disable-gpgsm-test
         - --enable-languages=cpp,qt6
+        - --prefix=/usr
         build-environment: *buildenvironment
+        override-build: |
+            craftctl default
+            rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
     kfilemetadata:
         after:
         - extra-cmake-modules



More information about the Neon-commits mailing list