summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2022-10-27 14:43:00 +0100
committerTim-Philipp Müller <tim@centricular.com>2022-10-27 15:39:02 +0100
commitbd8bd609f6151a82c57791d72d3c3c23d0e8c634 (patch)
tree80895113064e293265887d43c2e6fa801e97d526 /subprojects
parent2cfd08664d080ff22e357a5feeca9bc29ec1823c (diff)
downloadcairo-bd8bd609f6151a82c57791d72d3c3c23d0e8c634.tar.gz
ci: update Windows image to latest, and glib wrap too
Glib subproject git checkout isn't cached any more on the GStreamer CI image, so use tarball for now, and update to more recent glib. This means we can no longer use --default-library=both on Windows, so add separate jobs for static/shared build.
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/glib.wrap15
1 files changed, 10 insertions, 5 deletions
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index ca58d1a28..51d9cf8d4 100644
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -1,5 +1,10 @@
-[wrap-git]
-directory=glib
-url=https://gitlab.gnome.org/GNOME/glib.git
-push-url=git@gitlab.gnome.org:GNOME/glib.git
-revision=2.66.7
+[wrap-file]
+directory = glib-2.74.0
+source_url = https://download.gnome.org/sources/glib/2.74/glib-2.74.0.tar.xz
+source_filename = glib-2.74.0.tar.xz
+source_hash = 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+wrapdb_version = 2.74.0-1
+
+[provide]
+dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0
+program_names = glib-genmarshal, glib-mkenums, glib-compile-schemas, glib-compile-resources, gio-querymodules, gdbus-codegen