Merge pull request #295 from kiwix/new_xapian

Use xapian 1.4.10 insteal of 1.4.7

appveyor/install_xapian.cmd

@@ -1,9 +1,9 @@
 REM ========================================================
 REM Install xapian
-curl -fsSL -O http://download.kiwix.org/dev/xapian-core-1.4.7.zip || exit /b 1
-7z x xapian-core-1.4.7.zip || exit /b 1
-cd xapian-core-1.4.7
+curl -fsSL -O http://download.kiwix.org/dev/xapian-core-1.4.10.zip || exit /b 1
+7z x xapian-core-1.4.10.zip || exit /b 1
+cd xapian-core-1.4.10
 mkdir build
 cd build
-%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.7/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.10/build && /c/Projects/kiwix-build/appveyor/build_xapian.sh" > build_xapian.log || exit /b 1
 cd ..\..

kiwixbuild/dependencies/xapian.py

@@ -12,9 +12,12 @@ class Xapian(Dependency):
     name = "xapian-core"
 
     class Source(ReleaseDownload):
-        archive = Remotefile('xapian-core-1.4.7.tar.xz',
-                             '13f08a0b649c7afa804fa0e85678d693fd6069dd394c9b9e7d41973d74a3b5d3')
-        patches = ['xapian_sys_types.patch']
+        archive = Remotefile('xapian-core-1.4.10.tar.xz',
+                             '68669327e08544ac88fe3473745dbcae4e8e98d5060b436c4d566f1f78709bb8')
+        patches = [
+            'xapian_sys_types.patch',
+            'xapian_fix_include_errno.patch'
+        ]
 
     class Builder(MakeBuilder):
         configure_option = "--disable-sse --disable-backend-chert --disable-backend-inmemory --disable-documentation"

kiwixbuild/patches/xapian_fix_include_errno.patch

@@ -0,0 +1,11 @@
+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/versions.py

@@ -35,14 +35,14 @@ 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 = '15'
+base_deps_meta_version = '16'
 
 
 base_deps_versions = {
   'zlib' : '1.2.8',
   'lzma' : '5.2.3',
   'uuid' : '1.43.4',
-  'xapian-core' : '1.4.7',
+  'xapian-core' : '1.4.10',
   'mustache' : '3.2',
   'pugixml' : '1.2',
   'libmicrohttpd' : '0.9.46',

travis/compile_all.py

@@ -195,7 +195,7 @@ def make_deps_archive(target, full=False):
     archive_name = "deps_{}_{}_{}.tar.xz".format(
         TRAVIS_OS_NAME, PLATFORM, target)
     print_message("Create archive {}.", archive_name)
-    files_to_archive = [INSTALL_DIR/'INSTALL']
+    files_to_archive = [INSTALL_DIR]
     if PLATFORM == 'native_mixed':
         files_to_archive += [HOME/'BUILD_native_static'/'INSTALL']
     if PLATFORM.startswith('android'):