From 500d3bec865d4033be4662c2b6869034a05d3af8 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 31 Mar 2022 15:42:47 +0200 Subject: [PATCH 1/5] Use zlib 1.2.12 --- kiwixbuild/dependencies/zlib.py | 4 ++-- kiwixbuild/versions.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kiwixbuild/dependencies/zlib.py b/kiwixbuild/dependencies/zlib.py index 3950e46..0bbe5aa 100644 --- a/kiwixbuild/dependencies/zlib.py +++ b/kiwixbuild/dependencies/zlib.py @@ -13,8 +13,8 @@ class zlib(Dependency): name = 'zlib' class Source(ReleaseDownload): - archive = Remotefile('zlib-1.2.8.tar.gz', - '36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d') + archive = Remotefile('zlib-1.2.12.tar.gz', + '91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9') patches = ['zlib_std_libname.patch'] class Builder(MakeBuilder): diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index b244529..0f8d292 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -39,10 +39,10 @@ release_versions = { # This is the "version" of the whole base_deps_versions dict. # Change this when you change base_deps_versions. -base_deps_meta_version = '75' +base_deps_meta_version = '76' base_deps_versions = { - 'zlib' : '1.2.8', + 'zlib' : '1.2.12', 'lzma' : '5.2.4', 'zstd' : '1.5.1', 'docoptcpp' : '0.6.2', From 5a6af5f5ab39decc6878c53c7817cb4d26d882dc Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 11 Apr 2022 17:47:17 +0200 Subject: [PATCH 2/5] Use the last version of zlib on Windows. The `zlib-1.2.12.meson.zip` is the composition of the official `zlib.1.2.12.zip` archive and the meson wrabdb "patch" https://wrapdb.mesonbuild.com/v2/zlib_1.2.12-1/get_patch as described in https://wrapdb.mesonbuild.com/v2/zlib_1.2.12-1/zlib.wrap --- appveyor/install_zlib.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor/install_zlib.cmd b/appveyor/install_zlib.cmd index 2e1a00b..cae599a 100644 --- a/appveyor/install_zlib.cmd +++ b/appveyor/install_zlib.cmd @@ -1,8 +1,8 @@ REM ======================================================== REM Install zlib -curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/zlib-1.2.11.meson.zip || exit /b 1 -7z x zlib-1.2.11.meson.zip || exit /b 1 -cd zlib-1.2.11 +curl -fsSL -O http://mirror.download.kiwix.org/dev/zlib-1.2.12.meson.zip || exit /b 1 +7z x zlib-1.2.12.meson.zip || exit /b 1 +cd zlib-1.2.12 meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 cd build ninja || exit /b 1 From b7a3187b454dae11e9ac93dcc8788f48f95c01cd Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 11 Apr 2022 17:56:51 +0200 Subject: [PATCH 3/5] Update version of zstd. No need to update base_deps_meta_version as it is already updated in this same PR. --- appveyor/install_zstd.cmd | 8 +++----- kiwixbuild/dependencies/zstd.py | 6 +++--- kiwixbuild/versions.py | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) 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', From 5d967b3b262fb8cf05d243ba07c5bb064ca30abf Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 11 Apr 2022 18:13:53 +0200 Subject: [PATCH 4/5] Don't apply xapians patch on windows The patch doesn't exist... --- appveyor/install_xapian.cmd | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor/install_xapian.cmd b/appveyor/install_xapian.cmd index b91df7a..55dffb5 100644 --- a/appveyor/install_xapian.cmd +++ b/appveyor/install_xapian.cmd @@ -2,7 +2,6 @@ REM ======================================================== REM Install xapian curl -fsSL -O http://mirror.download.kiwix.org/dev/xapian-core-1.4.18.zip || exit /b 1 7z x xapian-core-1.4.18.zip || exit /b 1 -%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.18 && ../appveyor/apply_patch.sh xapian_remote.patch" || exit /b 1 cd xapian-core-1.4.18 mkdir build cd build From 0709fd20a5b740f88035bc87aa3505c75169f0ff Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 11 Apr 2022 18:14:21 +0200 Subject: [PATCH 5/5] Remove appveyor/applay_patch.sh We don't have any patch to apply anymore. --- appveyor/apply_patch.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 appveyor/apply_patch.sh diff --git a/appveyor/apply_patch.sh b/appveyor/apply_patch.sh deleted file mode 100644 index 4d85392..0000000 --- a/appveyor/apply_patch.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -mydir=$(dirname "$0") -patch -p1 < "$mydir"/../kiwixbuild/patches/"$1"