Merge pull request #478 from kiwix/xapian-1.4.18

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
+curl -fsSL -O http://mirror.download.kiwix.org/dev/xapian-core-1.4.18.zip || exit /b 1
-7z x xapian-core-1.4.14.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.14 && ../appveyor/apply_patch.sh xapian_remote.patch" || 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.14
+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 ..\..

kiwixbuild/dependencies/xapian.py

@@ -12,13 +12,8 @@ class Xapian(Dependency):
     name = "xapian-core"
 
     class Source(ReleaseDownload):
-        archive = Remotefile('xapian-core-1.4.14.tar.xz',
+        archive = Remotefile('xapian-core-1.4.18.tar.xz',
-                             '975a7ac018c9d34a15cc94a3ecc883204403469f748907e5c4c64d0aec2e4949')
+                             '196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77')
-        patches = [
-            'xapian_sys_types.patch',
-            'xapian_fix_include_errno.patch',
-            'xapian_remote.patch'
-        ]
 
     class Builder(MakeBuilder):
         configure_option = "--disable-sse --disable-backend-chert --disable-backend-remote --disable-documentation"

kiwixbuild/patches/xapian_fix_include_errno.patch

@@ -1,11 +0,0 @@
-diff -ur xapian-core-1.4.10/examples/xapian-pos.cc xapian-core-1.4.10.patched/examples/xapian-pos.cc
---- xapian-core-1.4.10/examples/xapian-pos.cc	2019-02-11 22:27:21.000000000 +0100
-+++ xapian-core-1.4.10.patched/examples/xapian-pos.cc	2019-02-18 16:43:08.593354559 +0100
-@@ -29,6 +29,7 @@
- #include <algorithm>
- #include <cstdlib>
- #include <limits>
-+#include <errno.h>
- 
- #include "gnu_getopt.h"
- #include "stringutils.h"

kiwixbuild/patches/xapian_remote.patch

@@ -1,47 +0,0 @@
-diff -ur xapian-core-1.4.14/matcher/multimatch.cc xapian-core-1.4.14.patched/matcher/multimatch.cc
---- xapian-core-1.4.14/matcher/multimatch.cc	2019-11-23 08:12:20.000000000 +0100
-+++ xapian-core-1.4.14.patched/matcher/multimatch.cc	2019-12-08 20:14:24.948683845 +0100
-@@ -441,9 +441,11 @@
-     // number of matching documents which is higher than the number of
-     // documents it returns (because it wasn't asked for more documents).
-     Xapian::doccount definite_matches_not_seen = 0;
-+#ifdef XAPIAN_HAS_REMOTE_BACKEND
-     // Track these for calculating uncollapsed_upper_bound for the local.
-     size_t n_remotes = 0;
-     Xapian::doccount remote_uncollapsed_upper_bound = 0;
-+#endif
-     try {
- 	for (size_t i = 0; i != leaves.size(); ++i) {
- 	    // Pick the highest total subqueries answer amongst the
-@@ -453,6 +455,7 @@
- 	    Xapian::termcount total_subqs_i = 0;
- 	    PostList* pl = leaves[i]->get_postlist(this, &total_subqs_i);
- 	    total_subqs = max(total_subqs, total_subqs_i);
-+#ifdef XAPIAN_HAS_REMOTE_BACKEND
- 	    if (is_remote[i]) {
- 		++n_remotes;
- 		RemoteSubMatch* rem_match =
-@@ -469,6 +472,7 @@
- 		    definite_matches_not_seen -= first + maxitems;
- 		}
- 	    }
-+#endif
- 	    postlists.push_back(pl);
- 	}
-     } catch (...) {
-@@ -950,6 +954,7 @@
-     Xapian::doccount uncollapsed_lower_bound = matches_lower_bound;
-     Xapian::doccount uncollapsed_upper_bound = matches_upper_bound;
-     Xapian::doccount uncollapsed_estimated = matches_estimated;
-+#ifdef XAPIAN_HAS_REMOTE_BACKEND
-     if (collapser && n_remotes) {
- 	// We need to adjust uncollapsed_upper_bound if there are multiple
- 	// shards and some or all are remote.  The lower bound and estimate
-@@ -971,6 +976,7 @@
- 	    }
- 	}
-     }
-+#endif
-     if (items.size() < max_msize) {
- 	// We have fewer items in the mset than we tried to get for it, so we
- 	// must have all the matches in it.

kiwixbuild/patches/xapian_sys_types.patch

@@ -1,12 +0,0 @@
-diff -ur xapian-core-1.4.7/backends/glass/glass_dbcheck.h xapian-core-1.4.7.patched/backends/glass/glass_dbcheck.h
---- xapian-core-1.4.7/backends/glass/glass_dbcheck.h	2017-10-16 04:32:24.000000000 +0200
-+++ xapian-core-1.4.7.patched/backends/glass/glass_dbcheck.h	2018-06-13 14:55:58.574898188 +0200
-@@ -24,7 +24,7 @@
- 
- #include "xapian/types.h"
- 
--#include <cstring> // For size_t.
-+#include <sys/types.h> // For size_t and off_t.
- #include <iosfwd>
- #include <string>
- #include <vector>

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