subprojects: Get zlib from Qt mirror

Getting it from the upstream mirror seems to fail miserably

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c653407..c7f6f9a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,7 +139,6 @@ build msys2:
     - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
         meson subprojects download &&
         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 &&

diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
new file mode 100644 (file)
index 0000000..4873958
--- /dev/null
+++ b/subprojects/zlib.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = zlib-1.2.11
+
+source_url = https://download.qt.io/development_releases/prebuilt/elfutils/zlib-1.2.11.tar.gz
+source_filename = zlib-1.2.11.tar.gz
+source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+
+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