diff --git a/build/linux/flatpak/1_build-deps-flatpak.sh b/build/linux/flatpak/1_build-deps-flatpak.sh index a4e09c2236..676c2b458c 100644 --- a/build/linux/flatpak/1_build-deps-flatpak.sh +++ b/build/linux/flatpak/1_build-deps-flatpak.sh @@ -31,13 +31,13 @@ if [ -z "$GITLAB_CI" ] && [ "$1" != '--ci' ]; then mkdir -p "$GIMP_PREFIX" fi - ## Clone and build deps + ## Clone and build deps (including babl and GEGL) flatpak-builder --force-clean --ccache --state-dir=../.flatpak-builder --keep-build-dirs --stop-at=gimp \ "$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json 2>&1 | tee flatpak-builder.log elif [ "$GITLAB_CI" ] || [ "$1" = '--ci' ]; then - ## Prepare env + ## Prepare env (only GIMP_PREFIX is needed for flatpak) export GIMP_PREFIX="$PWD/_install" ## Clone and build deps (including babl and GEGL) diff --git a/build/linux/flatpak/2_build-gimp-flatpak.sh b/build/linux/flatpak/2_build-gimp-flatpak.sh index ccb4b78bb6..982d9f5914 100644 --- a/build/linux/flatpak/2_build-gimp-flatpak.sh +++ b/build/linux/flatpak/2_build-gimp-flatpak.sh @@ -49,7 +49,8 @@ elif [ "$GITLAB_CI" ] || [ "$1" = '--ci' ]; then tar cf gimp-meson-log.tar .flatpak-builder/build/gimp-1/_flatpak_build/meson-logs/meson-log.txt fi - ## Cleanup GIMP_PREFIX and export it to OSTree repo + ## Cleanup GIMP_PREFIX (not working) and export it to OSTree repo + ## https://github.com/flatpak/flatpak-builder/issues/14 flatpak-builder --user --disable-rofiles-fuse --finish-only --repo=repo \ "$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json if [ "$1" != '--ci' ]; then