update to recoll-1.37.0

databases/recoll/Makefile

@@ -1,9 +1,11 @@
+DPB_PROPERTIES=	parallel
+
 COMMENT-main=	full text search application
 COMMENT-gui=	X user interface to recoll
 
 MULTI_PACKAGES=	-main -gui
 
-V=		1.33.4
+V=		1.37.0
 DISTNAME=	recoll-${V}
 
 CATEGORIES=	databases sysutils
@@ -18,8 +20,8 @@ SITES=		https://www.lesbonscomptes.com/recoll/
 # C++11
 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=	${COMPILER_LIBCXX} c iconv m xapian xml2 xslt z
+WANTLIB-main=	${WANTLIB} c iconv lzma m xapian z
 WANTLIB-gui=	${WANTLIB} GL Qt5Core Qt5Gui Qt5Network Qt5PrintSupport \
 		Qt5Widgets Qt5Xml
 
@@ -32,7 +34,7 @@ MODPY_EGG_VERSION=	$V
 MODPY_ADJ_FILES=	filters/*.py filters/rclepub
 
 USE_GMAKE=		Yes
-DPB_PROPERTIES=		parallel
+LIBTOOL_FLAGS=		--tag=disable-static
 
 BUILD_DEPENDS=		devel/py-setuptools${MODPY_FLAVOR} \
 			textproc/aspell/core
@@ -55,7 +57,8 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			QMAKE="${MODQT_QMAKE}"
 
-CONFIGURE_ARGS=		--disable-python-chm \
+CONFIGURE_ARGS=		--disable-python-aspell \
+			--disable-python-chm \
 			--disable-userdoc \
 			--without-inotify \
 			--without-fam \

databases/recoll/distinfo

@@ -1,2 +1,2 @@
-SHA256 (recoll-1.33.4.tar.gz) = ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc=
-SIZE (recoll-1.33.4.tar.gz) = 3685945
+SHA256 (recoll-1.37.0.tar.gz) = XZdpgwjWnEaS+sUIdOjDV3ktntP8z4coohh10Ps7WYA=
+SIZE (recoll-1.37.0.tar.gz) = 3137998

databases/recoll/patches/patch-Makefile_in

@@ -1,7 +1,7 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -2802,16 +2802,12 @@ PicStatic: $(librecoll_la_OBJECTS)
+@@ -2970,16 +2970,12 @@ CXXFLAGS ?= @CXXFLAGS@
  @MAKEPYTHON_TRUE@clean-local:: recollpython-clean
  @MAKEPYTHON_TRUE@recollpython: librecoll.la
  @MAKEPYTHON_TRUE@	(cd python/recoll; set -x; \
@@ -20,7 +20,7 @@ Index: Makefile.in
  @MAKEPYTHON_TRUE@         )
  @MAKEPYTHON_TRUE@recollpython-clean:
  @MAKEPYTHON_TRUE@	rm -f python/recoll/*.pyc
-@@ -2827,14 +2823,11 @@ PicStatic: $(librecoll_la_OBJECTS)
+@@ -2992,14 +2988,11 @@ CXXFLAGS ?= @CXXFLAGS@
  @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean
  @MAKEPYTHONCHM_TRUE@rclpychm:
  @MAKEPYTHONCHM_TRUE@	(cd python/pychm; set -x; \

databases/recoll/patches/patch-common_conf_post_h

@@ -1,19 +0,0 @@
-ports-gcc doesn't have features.h so this fails; ports-gcc is newer than 6.0 anyway
-
-Index: common/conf_post.h
---- common/conf_post.h.orig
-+++ common/conf_post.h
-@@ -73,11 +73,13 @@ typedef int ssize_t;
- #define REAL_GCC   __GNUC__ // probably
- #endif
- 
-+#if 0
- #ifdef REAL_GCC
- // Older gcc versions pretended to supply std::regex, but the resulting programs mostly crashed.
- #include <features.h>
- #if ! __GNUC_PREREQ(6,0)
- #define NO_STD_REGEX 1
-+#endif
- #endif
- #endif
- 

databases/recoll/patches/patch-internfile_mh_xslt_cpp

@@ -3,7 +3,7 @@ Unbreak build with libxml >=2.12.0
 Index: internfile/mh_xslt.cpp
 --- internfile/mh_xslt.cpp.orig
 +++ internfile/mh_xslt.cpp
-@@ -65,7 +65,7 @@ class FileScanXML : public FileScanDo { (public)
+@@ -66,7 +66,7 @@ class FileScanXML : public FileScanDo { (public)
      xmlDocPtr getDoc() {
          int ret;
          if ((ret = xmlParseChunk(ctxt, nullptr, 0, 1))) {
@@ -12,7 +12,7 @@ Index: internfile/mh_xslt.cpp
              LOGERR("FileScanXML: final xmlParseChunk failed with error " <<
                     ret << " error: " <<
                     (error ? error->message :
-@@ -94,7 +94,7 @@ class FileScanXML : public FileScanDo { (public)
+@@ -95,7 +95,7 @@ class FileScanXML : public FileScanDo { (public)
          }            
          int ret;
          if ((ret = xmlParseChunk(ctxt, buf, cnt, 0))) {

databases/recoll/pkg/PLIST-main

@@ -1,6 +1,32 @@
 @pkgpath databases/recoll
 @bin bin/recollindex
 @bin bin/recollq
+include/recoll/
+include/recoll/Filter.h
+include/recoll/docseq.h
+include/recoll/docseqdb.h
+include/recoll/hldata.h
+include/recoll/idxstatus.h
+include/recoll/internfile.h
+include/recoll/log.h
+include/recoll/mimehandler.h
+include/recoll/pathut.h
+include/recoll/plaintorich.h
+include/recoll/qresultstore.h
+include/recoll/rclconfig.h
+include/recoll/rcldb.h
+include/recoll/rcldoc.h
+include/recoll/rclinit.h
+include/recoll/rclquery.h
+include/recoll/rclutil.h
+include/recoll/readfile.h
+include/recoll/reslistpager.h
+include/recoll/searchdata.h
+include/recoll/smallut.h
+include/recoll/wasatorcl.h
+@so lib/librecoll-${MODPY_EGG_VERSION}.so
+lib/librecoll.la
+@so lib/librecoll.so
 lib/python${MODPY_VERSION}/site-packages/Recoll-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Recoll-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Recoll-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -19,16 +45,12 @@ lib/python${MODPY_VERSION}/site-packages/recoll/conftree.py
 lib/python${MODPY_VERSION}/site-packages/recoll/rclconfig.py
 lib/python${MODPY_VERSION}/site-packages/recoll/rclextract.py
 lib/python${MODPY_VERSION}/site-packages/recoll/recoll.py
-lib/recoll/
-@so lib/recoll/librecoll-${MODPY_EGG_VERSION}.so
-@static-lib lib/recoll/librecoll.a
-lib/recoll/librecoll.la
-@so lib/recoll/librecoll.so
 @man man/man1/recollindex.1
 @man man/man1/recollq.1
 @man man/man5/recoll.conf.5
 share/recoll/
 share/recoll/examples/
+share/recoll/examples/backends
 share/recoll/examples/fields
 share/recoll/examples/fragment-buttons.xml
 share/recoll/examples/mimeconf
@@ -47,6 +69,7 @@ share/recoll/examples/recollindex@.service
 share/recoll/filters/
 share/recoll/filters/abiword.xsl
 share/recoll/filters/cmdtalk.py
+share/recoll/filters/cnsplitter.py
 share/recoll/filters/conftree.py
 share/recoll/filters/fb2.xsl
 share/recoll/filters/gnumeric.xsl
@@ -63,6 +86,7 @@ share/recoll/filters/openxml-xls-body.xsl
 share/recoll/filters/ppt-dump.py
 share/recoll/filters/rcl7z.py
 share/recoll/filters/rclaptosidman
+share/recoll/filters/rclaspell-sugg.py
 share/recoll/filters/rclaudio.py
 share/recoll/filters/rclbasehandler.py
 share/recoll/filters/rclbibtex.sh
@@ -86,6 +110,7 @@ share/recoll/filters/rclimg
 share/recoll/filters/rclimg.py
 share/recoll/filters/rclinfo.py
 share/recoll/filters/rclipynb.py
+share/recoll/filters/rcljoplin.py
 share/recoll/filters/rclkar.py
 share/recoll/filters/rclkwd
 share/recoll/filters/rcllatinclass.py
@@ -108,6 +133,7 @@ share/recoll/filters/rclpython.py
 share/recoll/filters/rclrar.py
 share/recoll/filters/rclrtf.py
 share/recoll/filters/rclscribus
+share/recoll/filters/rclsfz.py
 share/recoll/filters/rclshowinfo
 share/recoll/filters/rcltar.py
 share/recoll/filters/rcltex
@@ -128,3 +154,4 @@ share/recoll/filters/xls-dump.py
 share/recoll/filters/xlsxmltocsv.py
 share/recoll/filters/xml.xsl
 share/recoll/translations/recoll_ja.qm
+share/recoll/translations/recoll_ru.qm