diff --git a/appveyor/install_zstd.cmd b/appveyor/install_zstd.cmd index 5f08da9..3339cbc 100644 --- a/appveyor/install_zstd.cmd +++ b/appveyor/install_zstd.cmd @@ -1,10 +1,8 @@ REM ======================================================== REM Install zstd -curl -fsSL -o zstd-v1.4.4.zip https://github.com/facebook/zstd/archive/v1.4.4.zip || exit /b 1 -7z x zstd-v1.4.4.zip || exit /b 1 -REM Fixing https://github.com/facebook/zstd/issues/2073 -%MINGW64_RUN% "cd /c/projects/kiwix-build/zstd-1.4.4 && ../appveyor/apply_patch.sh zstd_meson.patch" || exit /b 1 -cd zstd-1.4.4/build/meson +curl -fsSL -o zstd-v1.5.2.zip https://github.com/facebook/zstd/archive/refs/tags/v1.5.2.zip || exit /b 1 +7z x zstd-v1.5.2.zip || exit /b 1 +cd zstd-1.5.2/build/meson meson . builddir --prefix %EXTRA_DIR% --default-library static --buildtype release -Dbin_programs=false -Dbin_contrib=false || exit /b 1 cd builddir ninja || exit /b 1 diff --git a/kiwixbuild/dependencies/zstd.py b/kiwixbuild/dependencies/zstd.py index f142d82..0428b2c 100644 --- a/kiwixbuild/dependencies/zstd.py +++ b/kiwixbuild/dependencies/zstd.py @@ -11,9 +11,9 @@ class zstd(Dependency): name = 'zstd' class Source(ReleaseDownload): - archive = Remotefile('zstd-1.5.1.tar.gz', - 'e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002', - 'https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz') + archive = Remotefile('zstd-1.5.2.tar.gz', + 'f7de13462f7a82c29ab865820149e778cbfe01087b3a55b5332707abf9db4a6e', + 'https://github.com/facebook/zstd/archive/refs/tags/v1.5.2.tar.gz') class Builder(MesonBuilder): subsource_dir = 'build/meson' diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 0f8d292..29d6248 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -44,7 +44,7 @@ base_deps_meta_version = '76' base_deps_versions = { 'zlib' : '1.2.12', 'lzma' : '5.2.4', - 'zstd' : '1.5.1', + 'zstd' : '1.5.2', 'docoptcpp' : '0.6.2', 'uuid' : '1.43.4', 'xapian-core' : '1.4.18',