From 2d64114e60b9c525a7ff92f5c2cc05ab54dfeac7 Mon Sep 17 00:00:00 2001
From: Bruno Lopes <brunvonlope@outlook.com>
Date: Sat, 27 Dec 2025 16:59:47 -0300
Subject: [PATCH] gitlab-ci, build: Make meson build options order more
 consistent

---
 .gitlab-ci.yml                                 | 4 ++--
 build/linux/flatpak/org.gimp.GIMP-nightly.json | 8 ++++----
 build/linux/snap/snapcraft.yaml                | 8 ++++----
 build/windows/2_build-gimp-msys2.ps1           | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8099e48c13..84d859affa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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}
diff --git a/build/linux/flatpak/org.gimp.GIMP-nightly.json b/build/linux/flatpak/org.gimp.GIMP-nightly.json
index cb89f6cd29..1e4bfec1ef 100644
--- a/build/linux/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/linux/flatpak/org.gimp.GIMP-nightly.json
@@ -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"
diff --git a/build/linux/snap/snapcraft.yaml b/build/linux/snap/snapcraft.yaml
index 071a88d6cb..0bc1cfe76b 100644
--- a/build/linux/snap/snapcraft.yaml
+++ b/build/linux/snap/snapcraft.yaml
@@ -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
diff --git a/build/windows/2_build-gimp-msys2.ps1 b/build/windows/2_build-gimp-msys2.ps1
index 14fa4b1a16..935030b6bf 100644
--- a/build/windows/2_build-gimp-msys2.ps1
+++ b/build/windows/2_build-gimp-msys2.ps1
@@ -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 }
   }