recoll: update to 1.32.7.

- enable python module
- update version check page
- explicit conf args
- proper (host)makedepends
- update musl patches
- use helper to fix python cross

Co-authored-by: classabbyamp <void@placeviolette.net>
This commit is contained in:
Martin Dimov 2022-08-25 03:30:03 +03:00 committed by classabbyamp
parent 6baef6a9ca
commit 4976c61b3a
3 changed files with 39 additions and 22 deletions

View file

@ -1,5 +1,5 @@
Index: utils/fstreewalk.cpp
===================================================================
diff --git a/utils/fstreewalk.cpp b/utils/fstreewalk.cpp
index fc43edc..5e28d6e 100644
--- a/utils/fstreewalk.cpp
+++ b/utils/fstreewalk.cpp
@@ -17,6 +17,7 @@
@ -10,16 +10,33 @@ Index: utils/fstreewalk.cpp
#include <stdio.h>
#include <errno.h>
Index: utils/pxattr.cpp
===================================================================
--- a/utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200
+++ b/utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100
@@ -44,7 +44,7 @@
// just let the methods return errors (like they would on a non-xattr
// fs on e.g. linux)
diff --git a/utils/pxattr.cpp b/utils/pxattr.cpp
index 3a1f8f5..dcb93fc 100644
--- a/utils/pxattr.cpp
+++ b/utils/pxattr.cpp
@@ -46,7 +46,7 @@
-#if defined(__DragonFly__) || defined(__OpenBSD__)
+#if defined(__DragonFly__) || defined(__OpenBSD__) || !defined(__GLIBC__)
// Not exactly true for win32, but makes my life easier by avoiding ifdefs in recoll (the calls just
// fail, which is expected)
-#if defined(__DragonFly__) || defined(__OpenBSD__) || defined(_WIN32)
+#if defined(__DragonFly__) || defined(__OpenBSD__) || defined(_WIN32) || !defined(__GLIBC__)
#define HAS_NO_XATTR
#endif
diff --git a/common/conf_post.h b/common/conf_post.h
index 7093ead..0ecd56b 100644
--- a/common/conf_post.h
+++ b/common/conf_post.h
@@ -73,12 +73,4 @@ typedef int ssize_t;
#define REAL_GCC __GNUC__ // probably
#endif
-#ifdef REAL_GCC
-// Older gcc versions pretended to supply std::regex, but the resulting programs mostly crashed.
-#include <features.h>
-#if ! __GNUC_PREREQ(6,0)
-#define NO_STD_REGEX 1
-#endif
-#endif
-
#endif /* INCLUDED */

View file

@ -1,18 +1,18 @@
# Template file for 'recoll'
pkgname=recoll
version=1.30.0
version=1.32.7
revision=1
build_style=gnu-configure
build_helper=qmake
configure_args="--disable-python-module --disable-python-chm
--enable-recollq --disable-x11mon"
hostmakedepends="automake libtool gettext-devel qt5-qmake pkg-config
qt5-host-tools"
makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel
aspell-devel libxslt-devel libxml2-devel"
build_helper="qmake python3"
configure_args="--enable-recollq --disable-python-chm --disable-x11mon
--disable-webkit --without-systemd --disable-rpath"
hostmakedepends="pkg-config gettext-devel qt5-qmake qt5-host-tools
which python3-setuptools"
makedepends="libxslt-devel xapian-core-devel zlib-devel qt5-devel
python3-devel"
short_desc="Full text search tool based on Xapian backend"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-2.0-or-later"
homepage="https://www.lesbonscomptes.com/recoll/"
distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885
distfiles="https://www.lesbonscomptes.com/recoll/recoll-${version}.tar.gz"
checksum=ca08a6f4bb0b519bf915a062a9b7aadc4f343473cc1f07895708208d66337dba

View file

@ -1 +1 @@
site="https://www.lesbonscomptes.com/recoll/download.html"
site="https://www.lesbonscomptes.com/recoll/pages/download.html"