From a30fee551f33801688d3e0bf1eff959abdad9f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 6 Apr 2021 22:46:16 +0700 Subject: [PATCH] recoll: update to 1.30.0. --- .../patches/{musl-pxattr.patch => musl.patch} | 14 +++++++++++++ srcpkgs/recoll/template | 21 +++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) rename srcpkgs/recoll/patches/{musl-pxattr.patch => musl.patch} (52%) diff --git a/srcpkgs/recoll/patches/musl-pxattr.patch b/srcpkgs/recoll/patches/musl.patch similarity index 52% rename from srcpkgs/recoll/patches/musl-pxattr.patch rename to srcpkgs/recoll/patches/musl.patch index 22cee33313..c57aca4a56 100644 --- a/srcpkgs/recoll/patches/musl-pxattr.patch +++ b/srcpkgs/recoll/patches/musl.patch @@ -1,3 +1,17 @@ +Index: utils/fstreewalk.cpp +=================================================================== +--- utils/fstreewalk.cpp.orig ++++ utils/fstreewalk.cpp +@@ -17,6 +17,7 @@ + + #include "autoconfig.h" + ++#include + #include + + #include +Index: utils/pxattr.cpp +=================================================================== --- utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200 +++ utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100 @@ -44,7 +44,7 @@ diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 98fda41bbc..8c5de6966a 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -1,12 +1,13 @@ # Template file for 'recoll' pkgname=recoll -version=1.26.1 -revision=2 +version=1.30.0 +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" +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" short_desc="Full text search tool based on Xapian backend" @@ -14,16 +15,4 @@ maintainer="Rui Abreu Ferreira " license="GPL-2.0-or-later" homepage="https://www.lesbonscomptes.com/recoll/" distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=438f251c24baf954020cf3298872c74982f4c4abffd10197d7700db83072e732 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-devel qt5-webkit-devel" - - pre_configure() { - # xslt-config has the libxml2 hardcoded to /usr/include/libxml2 - # use cross path instead. - vsed -e 's;-I/usr/include/libxml2;-I${includedir}/libxml2;' \ - -e 's;libs="-lxslt -L/usr/lib -lxml2";libs="-lxslt -lxml2";g' \ - -i ${XBPS_WRAPPERDIR}/xslt-config - } -fi +checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885