recoll: partial update to 1.35.0

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Thu Sep 28 10:31:13 2023 +0200
Changeset:	700264bce13488201d633f64ff2e900ba03a1583

Modified Files:
	recoll/Makefile
	recoll/TODO
	recoll/distinfo
Added Files:
	recoll/patches/patch-utils_pxattr.cpp
Removed Files:
	recoll/patches/patch-utils_pathut.cpp

Log Message:
recoll: partial update to 1.35.0

Build is broken, see TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=700264bce13488201d633f64ff2e900ba03a1583

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 recoll/Makefile                       | 52 +++++++++++++++++++----------------
 recoll/TODO                           | 35 ++++++++++++++++++++---
 recoll/distinfo                       |  6 ++--
 recoll/patches/patch-utils_pathut.cpp | 33 ----------------------
 recoll/patches/patch-utils_pxattr.cpp | 13 +++++++++
 5 files changed, 75 insertions(+), 64 deletions(-)

diffs:
diff --git a/recoll/Makefile b/recoll/Makefile
index 3895f5751d..da1fdc6d85 100644
--- a/recoll/Makefile
+++ b/recoll/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/10/07 14:53:43 asau Exp $
-#
 
-DISTNAME=	recoll-1.17.3
+DISTNAME=	recoll-1.35.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 
@@ -10,42 +9,47 @@ HOMEPAGE=	https://www.lesbonscomptes.com/recoll/
 COMMENT=	Full text desktop search engine
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
+DEPENDS+=	pstotext-[0-9]*:../../converters/pstotext
+DEPENDS+=	antiword-[0-9]*:../../textproc/antiword
+DEPENDS+=	libwpd-[0-9]*:../../converters/libwpd
+DEPENDS+=	untex-[0-9]*:../../textproc/untex
+DEPENDS+=	tex-dvips-[0-9]*:../../print/tex-dvips
+DEPENDS+=	unrar-[0-9]*:../../archivers/unrar
+DEPENDS+=	p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
+DEPENDS+=	djvulibre-tools-[0-9]*:../../graphics/djvulibre-tools
+DEPENDS+=	${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+DEPENDS+=	${PYPKGPREFIX}-rarfile-[0-9]*:../../archivers/py-rarfile
+#DEPENDS+=	${PYPKGPREFIX}-chm-[0-9]*:../../wip/py-chm
+# RTF Files: unrtf
+# Midi karaoke files need Python and the Midi module
+# Konqueror webarchive format with Python (uses the Tarfile module).
+
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	perl:run pkg-config unzip:run
 
-CONFIGURE_ARGS+=	--disable-python-module
+#CONFIGURE_ARGS+=	--disable-python-module
 CONFIGURE_ARGS+=	--with-aspell=${BUILDLINK_PREFIX.aspell}/bin/aspell
 CONFIGURE_ARGS+=	--with-file-command=${BUILDLINK_PREFIX.file}/bin/file
 
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
-REPLACE_PERL+=		filters/rclimg
-
-REPLACE_PYTHON+=	desktop/hotrecoll.py
-REPLACE_PYTHON+=	filters/rclexecm.py
-REPLACE_PYTHON+=	filters/rclaudio
-REPLACE_PYTHON+=	filters/rclchm
-REPLACE_PYTHON+=	filters/rcldia
-REPLACE_PYTHON+=	filters/rclics
-REPLACE_PYTHON+=	filters/rclinfo
-REPLACE_PYTHON+=	filters/rclkar
-REPLACE_PYTHON+=	filters/rcllatinclass.py
-REPLACE_PYTHON+=	filters/rclpython
-REPLACE_PYTHON+=	filters/rclrar
-REPLACE_PYTHON+=	filters/rclwar
-REPLACE_PYTHON+=	filters/rclzip
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/chmlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
-# the package installs share/applications/recoll-searchgui.desktop
+.include "../../lang/python/tool.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/fam/buildlink3.mk"
+# not found by configure even when enabled
+#.include "../../sysutils/fam/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/xapian/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/recoll/TODO b/recoll/TODO
index 8fff7d6101..1db50a117f 100644
--- a/recoll/TODO
+++ b/recoll/TODO
@@ -1,5 +1,32 @@
-When pressing "Start Indexing now", it fails. On the console it says:
-Shared object "libxapian.so.22" not found
+Build stops at
 
-Looks like missing rpath
-[wiz 2013-04-16]
+--- recollindex ---
+ld: ./.libs/librecoll.a(mimetype.o): in function `mimetype(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, RclConfig*, bool, MedocUtils::PathStat const&)':
+/scratch/wip/recoll/work/recoll-1.35.0/index/mimetype.cpp:187: undefined reference to `pxattr::get(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, pxattr::flags, pxattr::nspace)'
+ld: ./.libs/librecoll.a(mh_text.o): in function `MimeHandlerText::set_document_file_impl(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)':
+/scratch/wip/recoll/work/recoll-1.35.0/internfile/mh_text.cpp:74: undefined reference to `pxattr::get(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, pxattr::flags, pxattr::nspace)'
+--- recollqt ---
+--- .obj/advshist.o ---
+In file included from advshist.cpp:24:
+../query/dynconf.h: In member function 'virtual bool RclSListEntry::decode(const string&)':
+../query/dynconf.h:75:9: error: 'base64_decode' was not declared in this scope; did you mean 'rk_base64_decode'?
+   75 |         base64_decode(enc, value);
+      |         ^~~~~~~~~~~~~
+      |         rk_base64_decode
+../query/dynconf.h: In member function 'virtual bool RclSListEntry::encode(std::string&)':
+../query/dynconf.h:79:9: error: 'base64_encode' was not declared in this scope; did you mean 'rk_base64_encode'?
+   79 |         base64_encode(value, enc);
+      |         ^~~~~~~~~~~~~
+      |         rk_base64_encode
+--- .obj/guiutils.o ---
+In file included from guiutils.cpp:37:
+../query/dynconf.h: In member function 'virtual bool RclSListEntry::decode(const string&)':
+../query/dynconf.h:75:9: error: 'base64_decode' was not declared in this scope; did you mean 'rk_base64_decode'?
+   75 |         base64_decode(enc, value);
+      |         ^~~~~~~~~~~~~
+      |         rk_base64_decode
+../query/dynconf.h: In member function 'virtual bool RclSListEntry::encode(std::string&)':
+../query/dynconf.h:79:9: error: 'base64_encode' was not declared in this scope; did you mean 'rk_base64_encode'?
+   79 |         base64_encode(value, enc);
+      |         ^~~~~~~~~~~~~
+      |         rk_base64_encode
diff --git a/recoll/distinfo b/recoll/distinfo
index 37c92e4119..b573569fa2 100644
--- a/recoll/distinfo
+++ b/recoll/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.2 2012/06/14 07:29:13 thomasklausner Exp $
 
-RMD160 (recoll-1.17.3.tar.gz) = 85a84f4f9e19b4126b3eff35faf91ba3b8a1a66a
-Size (recoll-1.17.3.tar.gz) = 1757278 bytes
-SHA1 (patch-utils_pathut.cpp) = b19083b616e334b1e613a3621be86fcbadfc82ab
+BLAKE2s (recoll-1.35.0.tar.gz) = ea04fb056b3b0d8d3f0cc1d64932f842268d19d246952d9947bf2516fc2395ae
+SHA512 (recoll-1.35.0.tar.gz) = 35dcbfb650251b00f2c7654dc7617bf24f7e480955121821c55e0d31c6ec4fa041f8f99e64afa12ad4ead725c366084d7d727dbdcee875b93bbc858a6229d236
+Size (recoll-1.35.0.tar.gz) = 3121862 bytes
diff --git a/recoll/patches/patch-utils_pathut.cpp b/recoll/patches/patch-utils_pathut.cpp
deleted file mode 100644
index 2d776b4d4f..0000000000
--- a/recoll/patches/patch-utils_pathut.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-utils_pathut.cpp,v 1.1 2012/06/14 07:29:13 thomasklausner Exp $
-
-NetBSD provides statvfs instead of statfs, like Solaris.
-
---- utils/pathut.cpp.orig	2012-04-27 20:16:14.000000000 +0000
-+++ utils/pathut.cpp
-@@ -62,7 +62,7 @@ using std::stack;
- 
- bool fsocc(const string &path, int *pc, long *blocks)
- {
--#ifdef sun
-+#if defined(sun) || defined(__NetBSD__)
-     struct statvfs buf;
-     if (statvfs(path.c_str(), &buf) != 0) {
- 	return false;
-@@ -554,7 +554,7 @@ int Pidfile::flopen()
- 	return -1;
-     }
- 
--#ifdef sun
-+#if defined(sun) || defined(__NetBSD__)
-     struct flock lockdata;
-     lockdata.l_start = 0;
-     lockdata.l_len = 0;
-@@ -576,7 +576,7 @@ int Pidfile::flopen()
- 	m_reason = "flock failed";
- 	return -1;
-     }
--#endif // ! sun
-+#endif // ! sun || NetBSD
- 
-     if (ftruncate(m_fd, 0) != 0) {
- 	/* can't happen [tm] */
diff --git a/recoll/patches/patch-utils_pxattr.cpp b/recoll/patches/patch-utils_pxattr.cpp
new file mode 100644
index 0000000000..15996e5303
--- /dev/null
+++ b/recoll/patches/patch-utils_pxattr.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- utils/pxattr.cpp.orig	2023-05-12 08:19:26.000000000 +0000
++++ utils/pxattr.cpp
+@@ -64,7 +64,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/extattr.h>
+ #include <sys/uio.h>
+ #elif defined(PXALINUX)