diff --git a/srcpkgs/recoll/patches/musl.patch b/srcpkgs/recoll/patches/musl.patch index 5d061a05789..9caa9382501 100644 --- a/srcpkgs/recoll/patches/musl.patch +++ b/srcpkgs/recoll/patches/musl.patch @@ -23,20 +23,3 @@ index 3a1f8f5..dcb93fc 100644 #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 -@@ -74,12 +74,4 @@ typedef int ssize_t; - #define REAL_GCC __GNUC__ // probably - #endif - --#if defined(REAL_GCC) && defined(HAVE_FEATURES_H) --// Older gcc versions pretended to supply std::regex, but the resulting programs mostly crashed. --#include --#if ! __GNUC_PREREQ(6,0) --#define NO_STD_REGEX 1 --#endif --#endif -- - #endif /* INCLUDED */ diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 7b33d23df03..83ec7fc677e 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -1,18 +1,18 @@ # Template file for 'recoll' pkgname=recoll -version=1.37.4 -revision=1 -build_style=gnu-configure -build_helper="qmake python3" -configure_args="--enable-recollq --disable-python-chm --disable-x11mon - --disable-webkit --without-systemd --disable-rpath" +version=1.40.4 +revision=2 +build_style=meson +build_helper="qmake" +configure_args="-Drecollq=true -Dpython-chm=false -Dx11mon=false + -Dwebkit=false -Dsystemd=false" hostmakedepends="pkg-config gettext-devel qt5-qmake qt5-host-tools - which python3-setuptools" + python3-setuptools which" makedepends="libxslt-devel xapian-core-devel zlib-devel qt5-devel - python3-devel aspell-devel" + python3-devel aspell-devel file-devel" short_desc="Full text search tool based on Xapian backend" maintainer="Rui Abreu Ferreira " license="GPL-2.0-or-later" homepage="https://www.lesbonscomptes.com/recoll/" distfiles="https://www.lesbonscomptes.com/recoll/recoll-${version}.tar.gz" -checksum=3109d76a65bb2f887231b643994ed701c2efe6ba0771f8451b39e2f186c3b6ad +checksum=a48503c4b0040dc1a476340cb7a1afb34366c21ae665bdad3c9ef8958845c1fa