[gimp/wip/Jehan/win-native-builds-failing] The -runtime package must be installed first because of dependencies.



commit 12182dc0fb2c0ca4b947dc4edd71dd18f1715773
Author: Jehan <jehan girinstud io>
Date:   Thu Sep 30 18:59:00 2021 +0200

    The -runtime package must be installed first because of dependencies.
    
    Also use https.

 build/windows/gitlab-ci/build-deps-msys2.sh | 4 +++-
 build/windows/gitlab-ci/build-gimp-msys2.sh | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 0181b72f1c..da0a82c6e4 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -40,8 +40,10 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-suitesparse \
     mingw-w64-$MSYS2_ARCH-vala
 
+# mingw-w64-$MSYS2_ARCH-gobject-introspection-runtime=1.68.0-2
+pacman -U 
https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gobject-introspection-runtime-1.68.0-2-any.pkg.tar.zst
 # 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
+pacman -U https://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}"
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index e7ed88ebf0..df740a9c84 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -63,10 +63,10 @@ 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
+pacman -U 
https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gobject-introspection-runtime-1.68.0-2-any.pkg.tar.zst
+# mingw-w64-$MSYS2_ARCH-gobject-introspection=1.68.0-2
+pacman -U https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gobject-introspection-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


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