From 4699d9e2acd6dafc50fb80b89e1a7fd0564eb026 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Tue, 24 Jan 2023 15:35:30 +0100
Subject: [PATCH] build, gitlab-ci: using non-ambiguous `meson setup` syntax.

Fixes:

> WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.
---
 .gitlab-ci.yml                                  | 14 +++++++-------
 build/windows/gitlab-ci/build-deps-crossroad.sh |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8b23a9201..c5b6ce9f8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,11 +170,11 @@ deps-debian:
     - export XDG_DATA_DIRS="${INSTALL_PREFIX}/share:/usr/local/share:/usr/share"
   script:
     - cd _babl
-    - meson -Dprefix="${INSTALL_PREFIX}" _build
+    - meson setup -Dprefix="${INSTALL_PREFIX}" _build
     - ninja -C _build
     - ninja -C _build install
     - cd ../_gegl
-    - meson --prefix="${INSTALL_PREFIX}" _build
+    - meson setup --prefix="${INSTALL_PREFIX}" _build
     - ninja -C _build
     - ninja -C _build install
   needs: ["build-image"]
@@ -240,7 +240,7 @@ gimp-meson-debian:
     - if: '$GIMP_CI_SOURCES != null'
   extends: .gimp-debian-base
   script:
-    - meson _build
+    - meson setup _build
       --prefix="${INSTALL_PREFIX}"
       -Dg-ir-doc=true -Dgi-docgen=enabled
     - ninja -C _build
@@ -267,7 +267,7 @@ gimp-clang-debian:
     - mkdir -p "$APT_CACHE"
     - apt-get install -y --no-install-recommends -o dir::cache::archives="$APT_CACHE"
         clang libomp-dev
-    - meson _build
+    - meson setup _build
       --prefix="${INSTALL_PREFIX}"
     - ninja -C _build
     - ninja -C _build test
@@ -278,7 +278,7 @@ gimp-meson-raster-icons:
     - if: '$GIMP_CI_RASTER_ICONS != null'
   extends: .gimp-debian-base
   script:
-    - meson _build
+    - meson setup _build
        --prefix="${INSTALL_PREFIX}"
        -Dvector-icons=false
     - ninja -C _build
@@ -546,7 +546,7 @@ gimp-win64:
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - mkdir _build && cd _build
-    - echo 'crossroad meson ..
+    - echo 'crossroad meson setup ..
               -Dgi-docgen=disabled && ninja && ninja install &&
             cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
             ' |
@@ -612,7 +612,7 @@ gimp-win32:
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - mkdir _build && cd _build
-    - echo 'crossroad meson ..
+    - echo 'crossroad meson setup ..
               -Dwmf=disabled  -Dmng=disabled -Dgi_docgen=false && ninja && ninja install &&
             cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
             ' |
diff --git a/build/windows/gitlab-ci/build-deps-crossroad.sh b/build/windows/gitlab-ci/build-deps-crossroad.sh
index 98fa17e30b..be55969eb7 100644
--- a/build/windows/gitlab-ci/build-deps-crossroad.sh
+++ b/build/windows/gitlab-ci/build-deps-crossroad.sh
@@ -5,7 +5,7 @@ mkdir _deps && cd _deps
 
 crossroad install lcms2 && \
 git clone --depth 1 https://gitlab.gnome.org/GNOME/babl.git && cd babl && \
-crossroad meson _build/ -Denable-gir=false -Dlibdir=lib && \
+crossroad meson setup _build/ -Denable-gir=false -Dlibdir=lib && \
 ninja -C _build install || exit 1
 cd ..
 
@@ -13,7 +13,7 @@ cd ..
 
 crossroad install cairo graphviz json-glib && \
 git clone --depth 1 https://gitlab.gnome.org/GNOME/gegl.git && cd gegl && \
-crossroad meson _build/ -Dintrospection=false -Dsdl2=disabled -Dlibdir=lib && \
+crossroad meson setup _build/ -Dintrospection=false -Dsdl2=disabled -Dlibdir=lib && \
 ninja -C _build install || exit 1
 cd ..