snap: cleanup

soumyaDghosh · Oct 14, 2024 · 690b21a · 690b21a
1 parent 5833699
commit 690b21a
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -22,16 +22,16 @@ slots:
     name: io.gitlab.news_flash.NewsFlash
 
 parts:
-  blueprint-compiler:
-    source: https://gitlab.gnome.org/jwestman/blueprint-compiler.git
-    source-tag: 'v0.12.0'
-# ext:updatesnap
-#   version-format:
-#     ignore: true
-    plugin: meson
-    meson-parameters:
-      - --prefix=/usr
-    override-prime: ''
+#   blueprint-compiler:
+#     source: https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+#     source-tag: 'v0.12.0'
+# # ext:updatesnap
+# #   version-format:
+# #     ignore: true
+#     plugin: meson
+#     meson-parameters:
+#       - --prefix=/usr
+#     override-prime: ''
 
   rustup:
     plugin: rust
@@ -46,8 +46,8 @@ parts:
     source-tag: '0.6.0'
     source-depth: 1
     build-snaps:
-      - ffmpeg-2404-sdk/latest/candidate
-      - ffmpeg-2404/latest/candidate
+      - ffmpeg-2404-sdk
+      - blueprint-compiler
     build-environment:
       - PKG_CONFIG_PATH: /snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:$PKG_CONFIG_PATH
       - PATH: ${CRAFT_STAGE}/usr/bin:${PATH}
@@ -73,17 +73,13 @@ parts:
       - -usr/lib/*/pkgconfig
 
   newsflash:
-    after: [rustup, blueprint-compiler, clapper]
+    after: [rustup, clapper]
     plugin: meson
     source: https://gitlab.com/api/v4/projects/8320003/packages/generic/newsflash/${SNAPCRAFT_PROJECT_VERSION}/newsflash-${SNAPCRAFT_PROJECT_VERSION}.tar.xz
     build-environment:
       - CARGO_BUILD_JOBS: ${CRAFT_PARALLEL_BUILD_COUNT}
       - PKG_CONFIG_PATH: /snap/webkitgtk-6-gnome-2404-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig:${PKG_CONFIG_PATH}
       - PATH: ${HOME}/.cargo/bin:/snap/webkitgtk-6-gnome-2404-sdk/current/usr/bin:${PATH}
-      - PYTHONPATH: ${CRAFT_STAGE}/usr/lib/python3/dist-packages:${PYTHONPATH}
-      - GI_TYPELIB_PATH: /snap/gnome-46-2404-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/girepository-1.0:/snap/gnome-46-2404-sdk/current/usr/lib/girepository-1.0:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/girepository-1.0:$GI_TYPELIB_PATH
-      - XDG_DATA_DIRS: /snap/webkitgtk-6-gnome-2404-sdk/current/usr/share:$XDG_DATA_DIRS
-      - LD_LIBRARY_PATH: /snap/webkitgtk-6-gnome-2404-sdk/current/usr/lib:/snap/webkitgtk-6-gnome-2404-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/webkitgtk-6-gnome-2404-sdk/current/usr/lib/webkitgtk-6.0:/snap/webkitgtk-6-gnome-2404-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/girepository-1.0:${LD_LIBRARY_PATH}
     meson-parameters:
       - --prefix=/snap/newsflash/current/usr
       - -Dbuildtype=release
@@ -106,8 +102,7 @@ parts:
         mv $i "`dirname $i`/snap.$CRAFT_PROJECT_NAME.`basename $i`"
       done
     build-snaps:
-      - webkitgtk-6-gnome-2404-sdk/latest/candidate
-      - webkitgtk-6-gnome-2404/latest/candidate
+      - webkitgtk-6-gnome-2404-sdk
     organize:
       snap/newsflash/current: .
     parse-info: [ usr/share/metainfo/io.gitlab.news_flash.NewsFlash.appdata.xml ]