From c34e5cba6aa6a60f5338ba2dac8255dab38a6a1b Mon Sep 17 00:00:00 2001 From: mobinmob Date: Wed, 16 Oct 2019 19:00:51 +0300 Subject: [PATCH] recoll: update to 1.26.0. --- srcpkgs/recoll/patches/qt-cross.patch | 25 ------------------------- srcpkgs/recoll/template | 13 +++++-------- 2 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/recoll/patches/qt-cross.patch diff --git a/srcpkgs/recoll/patches/qt-cross.patch b/srcpkgs/recoll/patches/qt-cross.patch deleted file mode 100644 index 7822cf95833..00000000000 --- a/srcpkgs/recoll/patches/qt-cross.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- qtgui/recoll.pro.in 2017-07-01 08:16:34.000000000 +0200 -+++ qtgui/recoll.pro.in 2017-12-17 14:56:27.433648300 +0100 -@@ -1,6 +1,13 @@ - TEMPLATE = app - LANGUAGE = C++ - -+QMAKE_CC = @CC@ -+QMAKE_CXX = @CXX@ -+QMAKE_LINK = @CXX@ -+QMAKE_CFLAGS = @CFLAGS@ -+QMAKE_CXXFLAGS = @CXXFLAGS@ -+QMAKE_LFLAGS = @LDFLAGS@ -+ - VPATH = @srcdir@ - DEFINES += BUILDING_RECOLL - -@@ -160,7 +167,7 @@ - - unix { - isEmpty(PREFIX) { -- PREFIX = /usr/local -+ PREFIX = /usr - } - message("Prefix is $$PREFIX") - DEFINES += PREFIX=\\\"$$PREFIX\\\" diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 4ddcd6291ff..3df9de619d6 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -1,22 +1,19 @@ # Template file for 'recoll' pkgname=recoll -version=1.24.5 +version=1.26.0 revision=1 build_style=gnu-configure configure_args="--disable-python-module --enable-recollq --disable-x11mon" -hostmakedepends="automake libtool gettext-devel qt5-qmake" +hostmakedepends="automake libtool gettext-devel qt5-qmake python3-setuptools" makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel - aspell-devel" + aspell-devel libchmlib-devel libxslt-devel python3-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/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=9b25f4494023fcea729ff96dd2bb525e78df14caf4ebab3a93377a0b1f50a382 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-devel qt5-webkit-devel" -fi +checksum=e6e8539ffe9877592722b6789eb53313e1310183e3b95ed77fe3babf755d9162 +nocross=yes pre_configure() { autoreconf -fi