[gimp/wip/Jehan/win-native-builds-failing] build: use pacman -U because MSYS2 does not support installing older…



commit 804f0486dca41cc55e1605119a15ca35241df8bb
Author: Jehan <jehan girinstud io>
Date:   Thu Sep 30 18:38:39 2021 +0200

    build: use pacman -U because MSYS2 does not support installing older…
    
    … versions, even when the package are still in the repo.

 build/windows/gitlab-ci/build-deps-msys2.sh | 4 +++-
 build/windows/gitlab-ci/build-gimp-msys2.sh | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index af6c05bcad..0181b72f1c 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -30,7 +30,6 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-cairo \
     mingw-w64-$MSYS2_ARCH-crt-git \
     mingw-w64-$MSYS2_ARCH-glib-networking \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection=1.68.0-2 \
     mingw-w64-$MSYS2_ARCH-json-glib \
     mingw-w64-$MSYS2_ARCH-lcms2 \
     mingw-w64-$MSYS2_ARCH-lensfun \
@@ -41,6 +40,9 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-suitesparse \
     mingw-w64-$MSYS2_ARCH-vala
 
+# mingw-w64-$MSYS2_ARCH-gobject-introspection=1.68.0-2
+pacman -U http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gobject-introspection-1.68.0-2-any.pkg.tar.zst
+
 export GIT_DEPTH=1
 export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}"
 export PATH="$GIMP_PREFIX/bin:$PATH"
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index d1f91777e1..e7ed88ebf0 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -34,8 +34,6 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gexiv2 \
     mingw-w64-$MSYS2_ARCH-ghostscript \
     mingw-w64-$MSYS2_ARCH-glib-networking \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection=1.68.0-2 \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection-runtime=1.68.0-2 \
     mingw-w64-$MSYS2_ARCH-graphviz \
     mingw-w64-$MSYS2_ARCH-gtk3 \
     mingw-w64-$MSYS2_ARCH-gtk-doc \
@@ -65,6 +63,11 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-vala \
     mingw-w64-$MSYS2_ARCH-xpm-nox
 
+# mingw-w64-$MSYS2_ARCH-gobject-introspection=1.68.0-2
+pacman -U http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gobject-introspection-1.68.0-2-any.pkg.tar.zst
+# mingw-w64-$MSYS2_ARCH-gobject-introspection-runtime=1.68.0-2
+pacman -U 
http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gobject-introspection-runtime-1.68.0-2-any.pkg.tar.zst
+
 # XXX We've got a weird error when the prefix is in the current dir.
 # Until we figure it out, this trick seems to work, even though it's
 # completely ridiculous.


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