diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf065fe9f..b43a1a571 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -256,6 +256,7 @@ fedora meson build: # Environment variables substitutions is done by PowerShell before calling # cmd.exe, that's why we use $env:FOO instead of %FOO% - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH && + meson subprojects update --reset && meson build $env:MESON_ARGS && ninja -C build" diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap index 0b7c53e54..f5f595c02 100644 --- a/subprojects/expat.wrap +++ b/subprojects/expat.wrap @@ -1,10 +1,9 @@ [wrap-file] -directory = expat-2.2.5 +directory = expat-2.2.9 +source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz +source_filename = expat-2.2.9.tar.bz2 +source_hash = 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4 +patch_url = https://wrapdb.mesonbuild.com/v1/projects/expat/2.2.9/3/get_zip +patch_filename = expat-2.2.9-3-wrap.zip +patch_hash = e9aaace62e9a158b5e96f5c38c9f81f369179206acd87697653d777c0d3975d3 -source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_5/expat-2.2.5.tar.bz2 -source_filename = expat-2.2.5.tar.bz2 -source_hash = d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 - -patch_url = https://wrapdb.mesonbuild.com/v1/projects/expat/2.2.5/4/get_zip -patch_filename = expat-2.2.5-4-wrap.zip -patch_hash = 25748839be2bbdd2ff586d1a05aa6fc37aeada75c78416df6e8347a6321abaac diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap index 3151539c8..c346deb01 100644 --- a/subprojects/freetype2.wrap +++ b/subprojects/freetype2.wrap @@ -1,5 +1,4 @@ [wrap-git] -directory=freetype2 -url=https://github.com/centricular/freetype2.git -push-url=git@github.com:centricular/freetype2.git -revision=meson +directory=freetype +url=https://gitlab.freedesktop.org/freetype/freetype.git +revision=VER-2-11-0 diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index 3964b1c25..ca58d1a28 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -2,4 +2,4 @@ directory=glib url=https://gitlab.gnome.org/GNOME/glib.git push-url=git@gitlab.gnome.org:GNOME/glib.git -revision=2.64.4 +revision=2.66.7 diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap index 79e2eecc8..4595c930a 100644 --- a/subprojects/zlib.wrap +++ b/subprojects/zlib.wrap @@ -1,11 +1,13 @@ [wrap-file] directory = zlib-1.2.11 - source_url = https://zlib.net/fossils/zlib-1.2.11.tar.gz source_fallback_url = https://gstreamer.freedesktop.org/data/src/mirror/zlib-1.2.11.tar.gz source_filename = zlib-1.2.11.tar.gz source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 +patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/5/get_zip +patch_filename = zlib-1.2.11-5-wrap.zip +patch_hash = 728c8e24acbc2e6682fbd950fec39e2fc77528af361adb87259f8a8511434004 + +[provide] +zlib = zlib_dep -patch_url = https://github.com/mesonbuild/zlib/releases/download/1.2.11-3/zlib.zip -patch_filename = zlib-1.2.11-3-wrap.zip -patch_hash = f07dc491ab3d05daf00632a0591e2ae61b470615b5b73bcf9b3f061fff65cff0