From 8ece2692ab4a048718d59201fd557e02cdef3993 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 8 Apr 2019 12:59:44 +0200 Subject: [PATCH] Windows: switch to xapian 1.4.11 --- src/common/autoconfig-win.h | 4 ++-- src/windows/mkinstdir.sh | 2 +- src/windows/qmkrecoll/librecoll.pro | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/autoconfig-win.h b/src/common/autoconfig-win.h index bf338a84..5a4b90f3 100644 --- a/src/common/autoconfig-win.h +++ b/src/common/autoconfig-win.h @@ -112,10 +112,10 @@ overriden in the c++ code by ifdefs _WIN32 anyway */ #define PACKAGE_NAME "Recoll" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Recoll 1.25.6" +#define PACKAGE_STRING "Recoll 1.25.11" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.25.6" +#define PACKAGE_VERSION "1.25.11" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "recoll" diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh index 3eec047e..3ce6d0c8 100644 --- a/src/windows/mkinstdir.sh +++ b/src/windows/mkinstdir.sh @@ -35,7 +35,7 @@ UNRTF=${RCLDEPS}unrtf ANTIWORD=${RCLDEPS}antiword PYXSLT=${RCLDEPS}pyxslt PYEXIV2=${RCLDEPS}pyexiv2 -LIBXAPIAN=${RCLDEPS}xapian-core-1.4.5/.libs/libxapian-30.dll +LIBXAPIAN=${RCLDEPS}xapian-core-1.4.11/.libs/libxapian-30.dll MUTAGEN=${RCLDEPS}mutagen-1.32/ EPUB=${RCLDEPS}epub-0.5.2 FUTURE=${RCLDEPS}python2-future diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro index a564df26..f3efe35d 100644 --- a/src/windows/qmkrecoll/librecoll.pro +++ b/src/windows/qmkrecoll/librecoll.pro @@ -139,11 +139,11 @@ windows { } LIBS += C:/recolldeps/libxslt/libxslt-1.1.29/win32/bin.mingw/libxslt.a \ C:/recolldeps/libxml2/libxml2-2.9.4+dfsg1/win32/bin.mingw/libxml2.a \ - c:/recolldeps/xapian-core-1.4.5/.libs/libxapian-30.dll \ + c:/recolldeps/xapian-core-1.4.11/.libs/libxapian-30.dll \ c:/recolldeps/zlib-1.2.8/zlib1.dll \ -liconv -lshlwapi -lpsapi -lkernel32 INCLUDEPATH += ../../windows \ - C:/recolldeps/xapian-core-1.4.5/include \ + C:/recolldeps/xapian-core-1.4.11/include \ C:/recolldeps/libxslt/libxslt-1.1.29/ \ C:/recolldeps/libxml2/libxml2-2.9.4+dfsg1/include