diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-08-05 19:57:31 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-08-05 21:35:38 +0200 |
| commit | 774d431525cf54245a0d6e9d859dfe42eaa9446a (patch) | |
| tree | b13a54073bd7b798b601b903c8317766ed894396 /.gitlab-ci | |
| parent | d7c4f93c76eaeab7d90fef486bc6eed9e3c6580c (diff) | |
| download | gtk+-774d431525cf54245a0d6e9d859dfe42eaa9446a.tar.gz | |
CI: msys2: build glib/pango master manually before gtk
The win toolchain has problems linking meson subprojects to libgtk.
To work around that build glib/pango from git and install them first
as long as the installed version is too old at least.
Fixes #3002
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/test-msys2.sh | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 0913ad7f0c..bd5627e649 100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -33,12 +33,24 @@ pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-gst-plugins-bad \ mingw-w64-$MSYS2_ARCH-shared-mime-info -# https://gitlab.gnome.org/GNOME/gtk/issues/2243 -wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst" -pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst" +# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243 +# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002 -# https://github.com/msys2/MINGW-packages/pull/6465 -pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli +if ! pkg-config --atleast-version=2.65.0 glib-2.0; then + git clone https://gitlab.gnome.org/GNOME/glib.git _glib + meson setup _glib_build _glib + meson compile -C _glib_build + meson install -C _glib_build +fi +pkg-config --modversion glib-2.0 + +if ! pkg-config --atleast-version=1.45.4 pango; then + git clone https://gitlab.gnome.org/GNOME/pango.git _pango + meson setup _pango_build _pango + meson compile -C _pango_build + meson install -C _pango_build +fi +pkg-config --modversion pango mkdir -p _ccache export CCACHE_BASEDIR="$(pwd)" |