update to recoll-1.31.6

fix some #!/usr/bin/python3, add some optional runtime deps which are
small and used by the built-in filters for common file types, and switch
to qtwebengine for -gui on archs where it's available

databases/recoll/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2021/11/26 09:04:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2022/02/12 12:33:20 sthen Exp $
 
 COMMENT-main=	full text search application
 COMMENT-gui=	X user interface to recoll
 
 MULTI_PACKAGES=	-main -gui
 
-V=		1.31.4
+V=		1.31.6
 DISTNAME=	recoll-${V}
 
 SHARED_LIBS +=	recoll-${V}            1.0 # 0.0
@@ -25,8 +25,7 @@ COMPILER=	base-clang ports-gcc
 
 WANTLIB=	${COMPILER_LIBCXX} c iconv m xapian z
 WANTLIB-main=	${WANTLIB} c iconv lzma m xapian xml2 xslt z
-WANTLIB-gui=	${WANTLIB} GL Qt5Core Qt5Gui Qt5Network \
+WANTLIB-gui=	${WANTLIB} GL Qt5Core Qt5Gui Qt5Network Qt5PrintSupport \
-		Qt5PrintSupport Qt5WebKit Qt5WebKitWidgets \
 		Qt5Widgets Qt5Xml lib/recoll/recoll-${V}
 
 # otherwise dependency check during build fails when updating
@@ -39,6 +38,7 @@ DEBUG_PACKAGES=	${BUILD_PACKAGES}
 MODULES=		lang/python \
 			x11/qt5
 MODPY_EGG_VERSION=	$V
+MODPY_ADJ_FILES=	filters/*.py filters/rclepub
 
 USE_GMAKE=		Yes
 DPB_PROPERTIES=		parallel
@@ -48,10 +48,16 @@ BUILD_DEPENDS=		devel/py-setuptools${MODPY_FLAVOR} \
 
 LIB_DEPENDS-main=	databases/xapian-core \
 			textproc/libxslt
+# listing deps used by the included filters for some common file formats;
+# see https://www.lesbonscomptes.com/recoll/pages/features.html for others
+RUN_DEPENDS-main=	archivers/unzip \
+			audio/py-mutagen${MODPY_FLAVOR} \
+			graphics/p5-Image-ExifTool \
+			print/poppler,-utils \
+			textproc/unrtf
 
 LIB_DEPENDS-gui=	${MODQT5_LIB_DEPENDS} \
-			databases/recoll \
+			databases/recoll
-			x11/qt5/qtwebkit
 
 CONFIGURE_STYLE=	gnu
 
@@ -66,6 +72,16 @@ CONFIGURE_ARGS=		--disable-python-chm \
 			--without-qzeitgeist \
 			--enable-recollq
 
+.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Maarch64} || ${MACHINE_ARCH:Mi386}
+CONFIGURE_ARGS+=	--enable-webengine
+LIB_DEPENDS-gui+=	x11/qt5/qtwebengine
+WANTLIB-gui+=	Qt5Positioning Qt5Qml Qt5QmlModels Qt5Quick Qt5WebChannel \
+		Qt5WebEngine Qt5WebEngineCore Qt5WebEngineWidgets
+.else
+LIB_DEPENDS-gui+=	x11/qt5/qtwebkit
+WANTLIB-gui+=	Qt5WebKit Qt5WebKitWidgets
+.endif
+
 pre-configure:
 	sed -i -e "s,!!LIBrecoll_VERSION_R!!,${LIBrecoll_VERSION:R}," \
 		-e "s,!!LIBrecoll_VERSION_E!!,${LIBrecoll_VERSION:E}," \

databases/recoll/distinfo

@@ -1,2 +1,2 @@
-SHA256 (recoll-1.31.4.tar.gz) = aCXw7y5BNeecCny70atIvkbRyvlhf1uRnr/6haExAVY=
+SHA256 (recoll-1.31.6.tar.gz) = FjrG7Fo41BAmK1CXZrbwmFt/h/IVcr6KGwy5PE9BJZQ=
-SIZE (recoll-1.31.4.tar.gz) = 3696726
+SIZE (recoll-1.31.6.tar.gz) = 3697735

databases/recoll/pkg/PLIST-gui

@@ -1,10 +1,6 @@
-@comment $OpenBSD: PLIST-gui,v 1.3 2021/03/31 20:08:37 sthen Exp $
+@comment $OpenBSD: PLIST-gui,v 1.4 2022/02/12 12:33:20 sthen Exp $
 @bin bin/recoll
 share/applications/recoll-searchgui.desktop
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/recoll.png
 share/metainfo/
 share/metainfo/recoll.appdata.xml