From aad2243c81ee07e06a600644d4ece20f4c97acdf Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 7 Mar 2021 14:41:33 +0100 Subject: [PATCH] Bump-up Xapian to version 1.4.18 --- appveyor/install_xapian.cmd | 10 +++++----- kiwixbuild/dependencies/xapian.py | 4 ++-- kiwixbuild/versions.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor/install_xapian.cmd b/appveyor/install_xapian.cmd index 3e4d286..b91df7a 100644 --- a/appveyor/install_xapian.cmd +++ b/appveyor/install_xapian.cmd @@ -1,10 +1,10 @@ REM ======================================================== REM Install xapian -curl -fsSL -O http://mirror.download.kiwix.org/dev/xapian-core-1.4.14.zip || exit /b 1 -7z x xapian-core-1.4.14.zip || exit /b 1 -%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.14 && ../appveyor/apply_patch.sh xapian_remote.patch" || exit /b 1 -cd xapian-core-1.4.14 +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 -%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.14/build && /c/Projects/kiwix-build/appveyor/build_xapian.sh" > build_xapian.log || exit /b 1 +%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.18/build && /c/Projects/kiwix-build/appveyor/build_xapian.sh" > build_xapian.log || exit /b 1 cd ..\.. diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py index 9037344..6e31249 100644 --- a/kiwixbuild/dependencies/xapian.py +++ b/kiwixbuild/dependencies/xapian.py @@ -12,8 +12,8 @@ class Xapian(Dependency): name = "xapian-core" class Source(ReleaseDownload): - archive = Remotefile('xapian-core-1.4.14.tar.xz', - '975a7ac018c9d34a15cc94a3ecc883204403469f748907e5c4c64d0aec2e4949') + archive = Remotefile('xapian-core-1.4.18.tar.xz', + '196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77') patches = [ 'xapian_sys_types.patch', 'xapian_fix_include_errno.patch', diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 767bb8c..038fb6e 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -39,7 +39,7 @@ 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 = '70' +base_deps_meta_version = '71' base_deps_versions = { 'zlib' : '1.2.8', @@ -47,7 +47,7 @@ base_deps_versions = { 'zstd' : '1.4.4', 'docoptcpp' : '0.6.2', 'uuid' : '1.43.4', - 'xapian-core' : '1.4.14', + 'xapian-core' : '1.4.18', 'mustache' : '4.1', 'pugixml' : '1.2', 'libmicrohttpd' : '0.9.72',