From 9a7ec09dab212487cd1e116d2a4976f66e385837 Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 17 Mar 2026 20:49:14 +0100 Subject: [PATCH] =?UTF-8?q?gitlab-ci,=20build:=20-Drelocatable=20renamed?= =?UTF-8?q?=20as=20-Drelocatable-bundle=20and=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … changed into a combo in babl and GEGL. --- .gitlab-ci.yml | 2 +- build/linux/snap/snapcraft.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e29b9ae1ef..2206c011a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -342,7 +342,7 @@ deps-debian: image: !reference [deps-debian-nonreloc, image] variables: GIT_STRATEGY: none - RELOCATABLE_OPTION: '-Drelocatable=enabled' + RELOCATABLE_OPTION: '-Drelocatable-bundle=yes' PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true' script: - !reference [deps-debian-nonreloc, script] diff --git a/build/linux/snap/snapcraft.yaml b/build/linux/snap/snapcraft.yaml index ba8349ac57..e654183637 100644 --- a/build/linux/snap/snapcraft.yaml +++ b/build/linux/snap/snapcraft.yaml @@ -108,7 +108,7 @@ parts: meson-parameters: - -Dprefix=/usr - -Dlibdir=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR - - -Drelocatable=enabled + - -Drelocatable-bundle=yes - -Dpkgconfig.relocatable=true - -Dgi-docgen=disabled - -Dwith-docs=false @@ -135,7 +135,7 @@ parts: meson-parameters: - -Dprefix=/usr - -Dlibdir=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR - - -Drelocatable=enabled + - -Drelocatable-bundle=yes - -Dpkgconfig.relocatable=true - -Dgi-docgen=disabled - -Ddocs=false