From 5ef7e2a017dcfcfeb10ad376e9a8dcb5d7a37812 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 25 Apr 2023 14:38:13 +0200
Subject: [PATCH] New version of xapian 1.4.22

Fix #599
---
 kiwixbuild/dependencies/xapian.py     |  5 +++--
 kiwixbuild/patches/xapian_win32.patch | 20 ++++++++++++++++++++
 kiwixbuild/versions.py                |  4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 kiwixbuild/patches/xapian_win32.patch

diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py
index c0b86ce..64694df 100644
--- a/kiwixbuild/dependencies/xapian.py
+++ b/kiwixbuild/dependencies/xapian.py
@@ -12,8 +12,9 @@ class Xapian(Dependency):
     name = "xapian-core"
 
     class Source(ReleaseDownload):
-        archive = Remotefile('xapian-core-1.4.18.tar.xz',
-                             '196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77')
+        archive = Remotefile('xapian-core-1.4.22.tar.xz',
+                             '05884af00b06702ce486057d62a3bfbe6606cf965ada0f5ea570b328a2fa1ea8')
+        patches = ['xapian_win32.patch']
 
     class Builder(MakeBuilder):
         configure_option = "--disable-sse --disable-backend-chert --disable-backend-remote --disable-documentation"
diff --git a/kiwixbuild/patches/xapian_win32.patch b/kiwixbuild/patches/xapian_win32.patch
new file mode 100644
index 0000000..3816c02
--- /dev/null
+++ b/kiwixbuild/patches/xapian_win32.patch
@@ -0,0 +1,20 @@
+diff '--color=auto' -ur xapian-core-1.4.22/common/safesyssocket.h xapian-core-1.4.22.patched/common/safesyssocket.h
+--- xapian-core-1.4.22/common/safesyssocket.h	2023-02-02 02:00:40.000000000 +0100
++++ xapian-core-1.4.22.patched/common/safesyssocket.h	2023-04-25 15:46:52.228256033 +0200
+@@ -27,6 +27,7 @@
+ # include <sys/socket.h>
+ #else
+ # include "safewinsock2.h"
++# include <ws2tcpip.h>
+ #endif
+ 
+ #ifdef __WIN32__
+@@ -64,7 +65,7 @@
+ # endif
+ # define socket(D,T,P) socket_(D,T,P)
+ 
+-inline int accept_(int sockfd, struct sockaddr* addr, SOCKLEN_T* addrlen) {
++inline int accept_(int sockfd, struct sockaddr* addr, socklen_t* addrlen) {
+     // Winsock2's accept() returns the unsigned type SOCKET, which is a 32-bit
+     // type for WIN32 and a 64-bit type for WIN64.
+     //
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 6123c42..08c994b 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 = '84'
+base_deps_meta_version = '85'
 
 base_deps_versions = {
   'zlib' : '1.2.12',
@@ -47,7 +47,7 @@ base_deps_versions = {
   'zstd' : '1.5.2',
   'docoptcpp' : '0.6.2',
   'uuid' : '1.43.4',
-  'xapian-core' : '1.4.18',
+  'xapian-core' : '1.4.22',
   'mustache' : '4.1',
   'pugixml' : '1.2',
   'libmicrohttpd' : '0.9.76',