summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2021-07-20 13:30:09 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2021-07-20 13:38:12 -0400
commite56ce3461748cdb0bbdfc91cfdadc8eaee81eacb (patch)
treebb32adbb50678cc4c2fac9224148737c6b9bec10
parent465bcc8f5730a35f94870b2c8732bd880faaa7a4 (diff)
downloadlibnice-e56ce3461748cdb0bbdfc91cfdadc8eaee81eacb.tar.gz
subprojects: Get zlib from Qt mirror
Getting it from the upstream mirror seems to fail miserably
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--subprojects/zlib.wrap10
2 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c653407..c7f6f9a 100644
--- 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
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