diff --git a/.circleci/config.yml b/.circleci/config.yml index 9525c4aec..b013b5576 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: steps: - checkout - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y ninja-build gtk-doc-tools python3 python3-pip git g++-mingw-w64-i686 zip - - run: pip3 install meson==0.56.0 --upgrade + - run: pip3 install meson==0.60.0 - run: .ci/build-win32.sh - store_artifacts: path: harfbuzz-win32.zip @@ -159,7 +159,7 @@ jobs: steps: - checkout - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y ninja-build gtk-doc-tools python3 python3-pip git g++-mingw-w64-x86-64 zip - - run: pip3 install meson==0.56.0 --upgrade + - run: pip3 install meson==0.60.0 - run: bash .ci/build-win64.sh - store_artifacts: path: harfbuzz-win64.zip diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index 914309076..a865af423 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -1,10 +1,11 @@ -[wrap-git] -directory=glib -url=https://gitlab.gnome.org/GNOME/glib.git -depth=1 -push-url=git@gitlab.gnome.org:GNOME/glib.git -revision=2.58.1 +[wrap-file] +directory = glib-2.74.1 +source_url = https://download.gnome.org/sources/glib/2.74/glib-2.74.1.tar.xz +source_fallback_url = https://ftp.acc.umu.se/pub/gnome/sources/glib/2.74/glib-2.74.1.tar.xz +source_filename = glib-2.74.1.tar.xz +source_hash = 0ab981618d1db47845e56417b0d7c123f81a3427b2b9c93f5a46ff5bbb964964 +wrapdb_version = 2.74.1-1 [provide] -glib-2.0 = libglib_dep -gobject-2.0 = libgobject_dep +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