Skip to content

build: workarounds for gitlab instability and librsvg search path bug #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2024
Merged

build: workarounds for gitlab instability and librsvg search path bug #300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f0d7bf
build: workarounds for gitlab instability and librsvg search path bug
frenchwr Dec 3, 2024
ce2bba9
build: shorten C_INCLUDE_PATH for finding librsvg header files
frenchwr Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ apps:
parts:
babl:
plugin: meson
source: https://gitlab.gnome.org/GNOME/babl.git
source: https://github.com/GNOME/babl.git
source-tag: BABL_0_1_110
meson-parameters:
- --prefix=/usr
Expand All @@ -69,14 +69,16 @@ parts:
gegl:
after:
- babl
source: https://gitlab.gnome.org/GNOME/gegl.git
source: https://github.com/GNOME/gegl.git
source-tag: GEGL_0_4_50
plugin: meson
meson-parameters:
- --prefix=/usr
- --buildtype=release
- -Ddocs=false
- -Dworkshop=true
build-environment:
- C_INCLUDE_PATH: /snap/gnome-46-2404-sdk/current/usr/include/librsvg-2.0:${C_INCLUDE_PATH:+:$C_INCLUDE_PATH}
build-packages:
- ffmpeg
- libexiv2-dev
Expand Down Expand Up @@ -125,10 +127,10 @@ parts:
- babl
- gegl
plugin: meson
source: https://gitlab.gnome.org/GNOME/gimp.git
source: https://github.com/GNOME/gimp.git
override-pull: |
tag="$(echo "GIMP_${SNAPCRAFT_PROJECT_VERSION}" | tr "." "_" | tr "-" "_")"
git clone -b "$tag" https://gitlab.gnome.org/GNOME/gimp.git "$CRAFT_PART_SRC"
git clone -b "$tag" https://github.com/GNOME/gimp.git "$CRAFT_PART_SRC"
git submodule update --init
sed -i 's|^Icon=.*|Icon=/usr/share/icons/hicolor/256x256/apps/gimp.png|' desktop/gimp.desktop.in.in
meson-parameters:
Expand All @@ -147,6 +149,7 @@ parts:
- GEGL_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gegl-0.4
- GI_TYPELIB_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/girepository-1.0:$GI_TYPELIB_PATH
- LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- C_INCLUDE_PATH: /snap/gnome-46-2404-sdk/current/usr/include/librsvg-2.0:${C_INCLUDE_PATH:+:$C_INCLUDE_PATH}
build-packages:
- automake
- intltool
Expand Down