From 4047ec20dd2d4f898aaf4ce31ad82b764d167754 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 14 Jun 2018 14:53:47 +0200 Subject: [PATCH] Add xapian patch to correctly include sys types. --- kiwixbuild/dependencies/xapian.py | 1 + kiwixbuild/patches/xapian_sys_types.patch | 12 ++++++++++++ kiwixbuild/versions.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 kiwixbuild/patches/xapian_sys_types.patch diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py index 3d76cbc..d3c6a4f 100644 --- a/kiwixbuild/dependencies/xapian.py +++ b/kiwixbuild/dependencies/xapian.py @@ -14,6 +14,7 @@ class Xapian(Dependency): class Source(ReleaseDownload): archive = Remotefile('xapian-core-1.4.5.tar.xz', '85b5f952de9df925fd13e00f6e82484162fd506d38745613a50b0a2064c6b02b') + patches = ['xapian_sys_types.patch'] class Builder(MakeBuilder): configure_option = "--disable-sse --disable-backend-inmemory --disable-documentation" diff --git a/kiwixbuild/patches/xapian_sys_types.patch b/kiwixbuild/patches/xapian_sys_types.patch new file mode 100644 index 0000000..6a78712 --- /dev/null +++ b/kiwixbuild/patches/xapian_sys_types.patch @@ -0,0 +1,12 @@ +diff -ur xapian-core-1.4.5/backends/glass/glass_dbcheck.h xapian-core-1.4.5.patched/backends/glass/glass_dbcheck.h +--- xapian-core-1.4.5/backends/glass/glass_dbcheck.h 2017-10-16 04:32:24.000000000 +0200 ++++ xapian-core-1.4.5.patched/backends/glass/glass_dbcheck.h 2018-06-13 14:55:58.574898188 +0200 +@@ -24,7 +24,7 @@ + + #include "xapian/types.h" + +-#include // For size_t. ++#include // For size_t and off_t. + #include + #include + #include diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index f0f0f18..95ca19e 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -10,7 +10,7 @@ main_project_versions = { # This is the "version" of the whole base_deps_versions dict. # Change this when you change base_deps_versions. -base_deps_meta_version = '7' +base_deps_meta_version = '8' base_deps_versions = {