[gimp/wip/Jehan/artifacts-prefix: 3/4] build: mask glib and pango from pre-built Win32 package for the CI.



commit 3da8b9cc18d4df4a6469d96d9c12e0842b2f9e57
Author: Jehan <jehan girinstud io>
Date:   Thu Oct 24 14:34:05 2019 +0200

    build: mask glib and pango from pre-built Win32 package for the CI.
    
    Let's make sure they are not pulled in as dependency of other packages.
    This fixes the Win32 CI build now that we fixed the Pango minimum
    requirement in meson files.

 build/windows/crossbuild-gitlab-ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/build/windows/crossbuild-gitlab-ci.sh b/build/windows/crossbuild-gitlab-ci.sh
index 3fbb774dee..cb7ed708f5 100644
--- a/build/windows/crossbuild-gitlab-ci.sh
+++ b/build/windows/crossbuild-gitlab-ci.sh
@@ -65,8 +65,7 @@ cd ../..
 
 git clone --depth 1 https://gitlab.gnome.org/GNOME/glib.git && cd glib && \
 crossroad meson _build && ninja -C _build install || exit 1
-which glib-compile-resources
-rm -fr $CROSSROAD_PREFIX/bin/glib-compile-resources*
+crossroad mask glib
 cd ..
 
 # Pango (available in crossroad but too old)
@@ -75,6 +74,7 @@ crossroad install harfbuzz && \
 git clone --depth 1 https://gitlab.gnome.org/GNOME/pango.git && cd pango && \
 crossroad meson _build -Dintrospection=false && \
 ninja -C _build install || exit 1
+crossroad mask pango
 cd ..
 
 # preparing GIMP


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]