From 39d22f4694a1a6f3a871082cee1df3ce6443101b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 3 Nov 2019 07:50:43 +0100
Subject: [PATCH] recoll: update to 1.26.1

and use qmake build-helper
---
 srcpkgs/recoll/patches/qt-cross.patch | 25 -------------------------
 srcpkgs/recoll/template               | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 36 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..61bd80f884a 100644
--- a/srcpkgs/recoll/template
+++ b/srcpkgs/recoll/template
@@ -1,26 +1,27 @@
 # Template file for 'recoll'
 pkgname=recoll
-version=1.24.5
+version=1.26.1
 revision=1
 build_style=gnu-configure
-configure_args="--disable-python-module --enable-recollq --disable-x11mon"
+build_helper=qmake
+configure_args="--disable-python-module --disable-python-chm
+ --enable-recollq --disable-x11mon"
 hostmakedepends="automake libtool gettext-devel qt5-qmake"
 makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel
- aspell-devel"
+ aspell-devel libxslt-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=9b25f4494023fcea729ff96dd2bb525e78df14caf4ebab3a93377a0b1f50a382
+checksum=438f251c24baf954020cf3298872c74982f4c4abffd10197d7700db83072e732
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel qt5-webkit-devel"
+
+	pre_configure() {
+		# make the xslt-config wrapper call the xml2-config wrapper
+		sed -i -e "s;/usr/bin/xml2-config;${XBPS_WRAPPERDIR}/xml2-config;" \
+		 ${XBPS_WRAPPERDIR}/xslt-config
+	}
 fi
-
-pre_configure() {
-	autoreconf -fi
-
-	# Fix build with qt-511
-	sed -i '1,1i#include <QAbstractItemView>' qtgui/ssearch_w.cpp
-}