smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #525 from kiwix/zlib-1.2.12

This commit is contained in:
Matthieu Gautier 2022-04-12 11:01:50 +02:00 committed by GitHub
parent 71ac307916 0709fd20a5
commit 39b4077338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor/apply_patch.sh
View File

@ -1,4 +0,0 @@
#!/usr/bin/env bash
mydir=$(dirname "$0")
patch -p1 < "$mydir"/../kiwixbuild/patches/"$1"

1
appveyor/install_xapian.cmd
View File

@ -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

6
appveyor/install_zlib.cmd
View File

@ -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

8
appveyor/install_zstd.cmd
View File

@ -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

4
kiwixbuild/dependencies/zlib.py
View File

@ -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):

6
kiwixbuild/dependencies/zstd.py
View File

@ -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'

6
kiwixbuild/versions.py
View File

@ -39,12 +39,12 @@ 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',
'zstd' : '1.5.2',
'docoptcpp' : '0.6.2',
'uuid' : '1.43.4',
'xapian-core' : '1.4.18',