From 3e8fa656bc779f7db91c3a3fda00d61981b88f34 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Sat, 11 Oct 2025 09:14:15 -0300 Subject: [PATCH] build/linux: Take Snap version: from meson.build This reduces the burden over the project maintainer. --- build/linux/snap/3_dist-gimp-snapcraft.sh | 2 +- build/linux/snap/README.md | 2 +- build/linux/snap/snapcraft.yaml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/linux/snap/3_dist-gimp-snapcraft.sh b/build/linux/snap/3_dist-gimp-snapcraft.sh index 72bc4b7229..da4d4d9294 100644 --- a/build/linux/snap/3_dist-gimp-snapcraft.sh +++ b/build/linux/snap/3_dist-gimp-snapcraft.sh @@ -32,7 +32,7 @@ NAME=$(awk '/^name:/ { print $2 }' snapcraft.yaml) TRACK=$(awk -F. '/-Dbuild-id=/ { print $NF }' snapcraft.yaml) ## Get info about GIMP version -GIMP_VERSION=$(awk '/^version:/ { print $2 }' snapcraft.yaml) +GIMP_VERSION=$(awk -F"'" '/version:/ {print $2; exit}' meson.build) gimp_release=$([ "$(awk '/^grade:/ { print $2 }' snapcraft.yaml)" != 'devel' ] && echo true || echo false) printf "(INFO): Name: $NAME (track: $TRACK) | Version: $GIMP_VERSION\n" diff --git a/build/linux/snap/README.md b/build/linux/snap/README.md index 7a11a3cc60..179fb2cde0 100644 --- a/build/linux/snap/README.md +++ b/build/linux/snap/README.md @@ -37,7 +37,7 @@ ls "$(echo /snap/gnome*-sdk/current/usr/lib/$(gcc -print-multiarch)/pkgconfig)" ## Versioning the snap -Aside from setting the version of gimp, we also: +Unlike the flatpak, we do not need to manually set babl, gegl or GIMP tags, just: * For a **nightly** build, set "devel" on "grade" and use "experimental" on build-id at gimp part "meson-parameters". diff --git a/build/linux/snap/snapcraft.yaml b/build/linux/snap/snapcraft.yaml index 7b063150ea..6cedf8e87b 100644 --- a/build/linux/snap/snapcraft.yaml +++ b/build/linux/snap/snapcraft.yaml @@ -1,6 +1,5 @@ name: gimp adopt-info: gimp -version: 3.1.5 grade: devel base: core24 compression: lzo @@ -143,6 +142,9 @@ parts: - gegl source: . source-type: local + override-pull: | + craftctl default + craftctl set version="$(awk -F"'" '/version:/ {print $2; exit}' $CRAFT_PART_SRC/meson.build)" build-environment: *SNAP_ENVIRON plugin: meson meson-parameters: