meson: Move glib wrap to download

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6343d76..667d9b1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,6 +129,8 @@ build msys2:
 
 .build msvc:
   extends: build msys2
+  variables:
+    GLIB_VERSION: 2.64.2
   script:
     # For some reason, options are separated by newline instead of space, so we
     # have to replace them first.
@@ -145,9 +147,9 @@ build msys2:
     - New-Item -Path subprojects -Name openssl.wrap -Value "[wrap-git]`r`ndirectory=openssl`r`nurl=https://gitlab.freedesktop.org/libnice/openssl-binaries-for-ci.git`r`nrevision=1.1.1c`r`n"
     - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
         meson subprojects download &&
-        meson wrap promote subprojects\glib\subprojects\libffi.wrap &&
-        meson wrap promote subprojects\glib\subprojects\zlib.wrap &&
-        meson wrap promote subprojects\glib\subprojects\proxy-libintl.wrap &&
+        meson wrap promote subprojects\glib-$env:GLIB_VERSION\subprojects\libffi.wrap &&
+        meson wrap promote subprojects\glib-$env:GLIB_VERSION\subprojects\zlib.wrap &&
+        meson wrap promote subprojects\glib-$env:GLIB_VERSION\subprojects\proxy-libintl.wrap &&
         meson subprojects download"
     - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
         meson build $env:MESON_ARGS &&

diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index 9a4b73b..fdfb550 100644 (file)
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -1,5 +1,5 @@
-[wrap-git]
-directory=glib
-url=https://gitlab.gnome.org/GNOME/glib.git
-push-url=git@gitlab.gnome.org:GNOME/glib.git
-revision=glib-2-64
+[wrap-file]
+directory=glib-2.64.2
+source_url=https://ftp.gnome.org/pub/gnome/sources/glib/2.64/glib-2.64.2.tar.xz
+source_filename=glib-2.64.2.tar.xz
+source_hash=9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277
\ No newline at end of file