dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gitlab-ci, build: Make meson build options order more consistent

Browse source
This commit is contained in:
Bruno Lopes 2025-12-27 16:59:47 -03:00
parent c9526a6db4
commit 2d64114e60
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -360,9 +360,9 @@ gimp-debian:
# Build GIMP
- printf "\e[0Ksection_start:`date +%s`:gimp_build[collapsed=true]\r\e[0KBuilding GIMP\n"
- meson setup _build-${RUNNER} -Dprefix="${GIMP_PREFIX}"
-Dgi-docgen=disabled
-Dpkgconfig.relocatable=true
-Drelocatable-bundle=yes
-Dpkgconfig.relocatable=true
-Dgi-docgen=disabled
-Dcheck-update=yes
-Dbuild-id=org.gimp.GIMP_official.AppImage.$(uname -m)
- cd _build-${RUNNER}

8
build/linux/flatpak/org.gimp.GIMP-nightly.json
View file

@ -746,8 +746,8 @@
],
"buildsystem": "meson",
"config-opts": [
"-Dwith-docs=false",
"-Dgi-docgen=disabled"
"-Dgi-docgen=disabled",
"-Dwith-docs=false"
],
"cleanup": [
"/bin"
@ -764,8 +764,8 @@
],
"buildsystem": "meson",
"config-opts": [
"-Ddocs=false",
"-Dgi-docgen=disabled",
"-Ddocs=false",
"-Dworkshop=true"
],
"cleanup": [
@ -790,8 +790,8 @@
],
"buildsystem": "meson",
"config-opts": [
"-Dgi-docgen=disabled",
"-Dicc-directory=/run/host/usr/share/color/icc/",
"-Dgi-docgen=disabled",
"-Dcheck-update=no",
"-Denable-default-bin=enabled",
"-Dbuild-id=org.gimp.GIMP.flatpak.nightly"

8
build/linux/snap/snapcraft.yaml
View file

@ -105,8 +105,8 @@ parts:
meson-parameters:
- -Dprefix=/usr
- -Dlibdir=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- -Dwith-docs=false
- -Dgi-docgen=disabled
- -Dwith-docs=false
gegl:
after:
@ -130,9 +130,9 @@ parts:
meson-parameters:
- -Dprefix=/usr
- -Dlibdir=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- -Ddocs=false
- -Dgi-docgen=disabled
- -Drelocatable=enabled
- -Dgi-docgen=disabled
- -Ddocs=false
build-packages:
- libmaxflow-dev
- libopenexr-dev #https://github.com/ubuntu/gnome-sdk/issues/321
@ -160,8 +160,8 @@ parts:
meson-parameters:
- -Dprefix=/usr
- -Dlibdir=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- -Dgi-docgen=disabled
- -Drelocatable-bundle=yes
- -Dgi-docgen=disabled
- -Dcheck-update=no
- -Denable-default-bin=enabled
- -Dbuild-id=org.gimp.GIMP.snapcraft.experimental

2
build/windows/2_build-gimp-msys2.ps1
View file

@ -43,7 +43,7 @@ if (-not (Test-Path _build-$(@($env:VCPKG_DEFAULT_TRIPLET,$env:MSYSTEM_PREFIX) |
{
#FIXME: There is no GJS for Windows. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/5891
meson setup _build-$(@($env:VCPKG_DEFAULT_TRIPLET,$env:MSYSTEM_PREFIX) | ?{$_} | select -First 1) -Dprefix="$GIMP_PREFIX" $NON_RELOCATABLE_OPTION `
$INSTALLER_OPTION $STORE_OPTION $PKGCONF_RELOCATABLE_OPTION `
$PKGCONF_RELOCATABLE_OPTION $INSTALLER_OPTION $STORE_OPTION `
-Denable-default-bin=enabled -Dbuild-id='org.gimp.GIMP_official';
if ("$LASTEXITCODE" -gt '0') { exit 1 }
}