diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py index 64694df5..e71ed89e 100644 --- a/kiwixbuild/dependencies/xapian.py +++ b/kiwixbuild/dependencies/xapian.py @@ -12,9 +12,8 @@ class Xapian(Dependency): name = "xapian-core" class Source(ReleaseDownload): - archive = Remotefile('xapian-core-1.4.22.tar.xz', - '05884af00b06702ce486057d62a3bfbe6606cf965ada0f5ea570b328a2fa1ea8') - patches = ['xapian_win32.patch'] + archive = Remotefile('xapian-core-1.4.23.tar.xz', + '30d3518172084f310dab86d262b512718a7f9a13635aaa1a188e61dc26b2288c') 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 deleted file mode 100644 index 3816c022..00000000 --- a/kiwixbuild/patches/xapian_win32.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 - #else - # include "safewinsock2.h" -+# include - #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 39f293fc..eb352061 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -39,7 +39,7 @@ # This is the "version" of the whole base_deps_versions dict. # Change this when you change base_deps_versions. -base_deps_meta_version = '92' +base_deps_meta_version = '93' base_deps_versions = { 'zlib' : '1.2.12', @@ -47,7 +47,7 @@ 'zstd' : '1.5.2', 'docoptcpp' : '0.6.2', 'uuid' : '1.43.4', - 'xapian-core' : '1.4.22', + 'xapian-core' : '1.4.23', 'mustache' : '4.1', 'pugixml' : '1.2', 'libmicrohttpd' : '0.9.76',