summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-09-19 00:17:43 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-09-19 08:13:35 -0400
commit6b9622f0dabf42661a1acc09d8f5041e75edfd9d (patch)
tree9abb54f7eee9674ac0e7974bec5b0fb6d774b09a
parent69d5dc7c9a3f704ba9d423035864382fea390d67 (diff)
downloadgtk+-6b9622f0dabf42661a1acc09d8f5041e75edfd9d.tar.gz
Try one more time to fix win32 ci
-rw-r--r--.gitlab-ci/test-msys2.sh2
-rw-r--r--meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 1298ab659a..d311f4bbe7 100644
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -48,7 +48,7 @@ if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
fi
pkg-config --modversion glib-2.0
-if ! pkg-config --atleast-version=1.45.4 pango; then
+if ! pkg-config --atleast-version=1.47.0 pango; then
git clone https://gitlab.gnome.org/GNOME/pango.git _pango
meson setup _pango_build _pango
meson compile -C _pango_build
diff --git a/meson.build b/meson.build
index 242d0e394a..713c2f5475 100644
--- a/meson.build
+++ b/meson.build
@@ -23,7 +23,7 @@ else
endif
glib_req = '>= @0@.@1@.@2@'.format(glib_major_req, glib_minor_req, glib_micro_req)
-pango_req = '>= 1.47.0'
+pango_req = '>= 1.47.0' # keep this in sync with .gitlab-ci/test-msys.sh
fribidi_req = '>= 0.19.7'
cairo_req = '>= 1.14.0'
gdk_pixbuf_req = '>= 2.30.0'