CVS commit: pkgsrc/sysutils/recoll

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 13 13:55:37 UTC 2024

Modified Files:
        pkgsrc/sysutils/recoll: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/recoll/patches: patch-qtgui_qmkmk.sh

Log Message:
recoll: update to 1.40.3.

Changes in Recoll 1.40.0

    Python API: added module to compute an UDI for the filesystem
    indexer. Added an addOrUpdate() "metaonly" parameter for updating
    only the metadata.

    Python API: added a module for computing an FS indexer path
    UDI (to complement the above).

    Text splitter: better reporting of problem terms.

Minor releases at a glance

    1.40.3

        Fix a few minor issues in synonym handling: fix phrase
        searches with multi-word synonyms, perform white-space
        normalization while reading the synonyms file.

        Indexer: use SCHED_IDLE instead of maximum nice. Can be
        disabled by setting idxniceprio to 19 or less.

    1.40.2

        Fixed issues in the side directory tree: very long paths
        (resulting in a hashed UDI in the index) caused many issues.

        Add Markdown indexer with front matter parser.

        Real time indexing for MacOS.

    1.40.1

        GUI: fix very ennoying bug where the snippets links don’t
        open the PDF at the indicated page.

        GUI: fixes some preview window issues under Wayland.

Changes in Recoll 1.39.0

    Indexing: enable indexing non-alphanumeric characters as separate
    terms by listing them in the indexedpunctuation configuration
    variable. This is a very small change with almost no impact on
    the normal indexing when not used, but, when configured, it
    allows discriminating searches for, e.g., 1.50% and $1.50.

    Fixed menus floating around under Gnome/Wayland (also in 1.38.2).

    Fixed preview window mistakenly using a QTextBrowser instead
    of a proper HTML engine because of a build glitch (also in
    1.38.2)

    Fixed GUI not loading zh_CN messages.

    Updated simplified Chinese translation.

Minor releases at a glance

    1.39.5

        GUI: fix very ennoying bug where the snippets links don’t
        open the PDF at the indicated page.

    1.39.4

        GUI: only use the qApp colorscheme if the user has not
        explicitly set dark mode

        GUI: wayland: fix getting the app font family and size.
        Doing it in a separate thread did not work.

        GUI: wayland fix preview window not shown after dialog
        warning that stored text would be used.

    1.39.3

        Fix document modification dates set by handlers being
        sometimes ignored.

        GUI: filter some garbage values from the MIME list in adv.
        search.

        GUI: fix setting the restrict file types checkbox from
        saved search.

        Fix groff option (-man → -mandoc) for indexing man pages.

        Fix testing lyx version

        Fix gnumeric indexing (bad order of templates in xsl sheet).

        Fix syntax warnings in powerpoint Python handler.

        Update simdutf version to 5.3.0. The previous one crashed
        on some cpus.

        Fix meson build ordering issues (trying GUI build before
        lib done).

    1.39.2

        Update the version of the simdutf bundled Unicode converter
        library. The older one was crashing on some processors.

    1.39.1

        GUI: add possibility for switch light/dark mode according
        to the desktop setting. Needs qt 6.5+ and does not work on
        all desktops.

Changes in Recoll 1.38.0

    Indexing: allow using multiple temporary Xapian indexes and a
    final merge. This is useful for cases where the single-threaded
    Xapian index updates would be the indexing speed bottleneck,
    which would typically happen with simple input like HTML files.
    In such a case it can bring a huge speedup of indexing, e.g.
    3X on a 4 Core CPU. You are probably not indexing Wikipedia
    dumps, but if you are, this is a game changer.

    GUI: a new "File" menu entry for switching to another configuration,
    for people using multiple ones (which I don’t really recommend:
    use directory or other filtering instead).

    GUI: result list paragraph format: add %s for explicit snippets
    (rather than %A for abstract/snippets alternate).

    GUI: the user interface preferences tab is now scrollable. It
    was too high for some displays.

    New build method using meson and ninja. The GNU autotools have
    been highly useful for a very long time but the reasons which
    made them so complicated and opaque are mostly gone, and they
    have become replaceable.

    New AppImage executable single file image available on the web
    site. This should work on all reasonably recent Linux distributions
    (ref: Debian Buster).

    KDE KF6 support for the KIO slave and KRunner.

    Linux: use libmagic instead of executing file/xdg-mime to find
    out MIME types when there are no suffix mappings in mimemap.

    Joplin indexer: also index OCR’d text from attached images.

    MacOS: index the Finder tags and comments.

    Use simdutf (https://github.com/simdutf/simdutf), for faster
    Unicode conversions (mainly during diacritics removal).

    djvu: extract more metadata.

    Improve handling of match line for text documents.

    Windows: switched to 64 bits build and Qt 6.6

Minor releases at a glance

    1.38.1

        Fix Python 3.12 warnings about bad escapes in strings.

        Fix small issues in build/distribution/packaging.

        Windows: detect FS reparse points and treat them as symlinks
        for followLinks.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/recoll/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/recoll/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/recoll/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/recoll/patches/patch-qtgui_qmkmk.sh

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

Modified files:

Index: pkgsrc/sysutils/recoll/Makefile
diff -u pkgsrc/sysutils/recoll/Makefile:1.12 pkgsrc/sysutils/recoll/Makefile:1.13
--- pkgsrc/sysutils/recoll/Makefile:1.12        Fri Nov  1 12:54:30 2024
+++ pkgsrc/sysutils/recoll/Makefile     Wed Nov 13 13:55:37 2024
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2024/11/01 12:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/11/13 13:55:37 wiz Exp $
 
-DISTNAME=      recoll-1.37.2
-PKGREVISION=   4
+DISTNAME=      recoll-1.40.3
 CATEGORIES=    sysutils
-MASTER_SITES=  https://www.lesbonscomptes.com/recoll/
+MASTER_SITES=  https://www.recoll.org/
 
 MAINTAINER=    slitvinov%gmail.com@localhost
-HOMEPAGE=      https://www.lesbonscomptes.com/recoll/
+HOMEPAGE=      https://www.recoll.org/
 COMMENT=       Full text desktop search engine
 LICENSE=       gnu-gpl-v2
 
@@ -26,14 +25,11 @@ DEPENDS+=   ${PYPKGPREFIX}-rarfile-[0-9]*:
 # 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_LIBTOOL=   yes
 USE_TOOLS+=    perl:run pkg-config unzip:run
 
-CONFIGURE_ARGS+=       --enable-recollq
-CONFIGURE_ARGS+=       --with-aspell=${BUILDLINK_PREFIX.aspell}/bin/aspell
-CONFIGURE_ARGS+=       --with-file-command=${BUILDLINK_PREFIX.file}/bin/file
+MESON_ARGS+=   -Drecollq=true
+MESON_ARGS+=   -Dwebengine=true
 
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/recoll
@@ -51,7 +47,6 @@ SUBST_FILES.base64+=  qtgui/ssearch_w.cpp
 SUBST_FILES.base64+=   rcldb/searchdatatox.cpp
 SUBST_FILES.base64+=   rcldb/searchdataxml.cpp
 SUBST_FILES.base64+=   rcldb/searchdata.cpp
-SUBST_FILES.base64+=   Makefile.in
 #SUBST_FILES.base64+=  Makefile.am
 SUBST_FILES.base64+=   utils/fileudi.cpp
 SUBST_FILES.base64+=   utils/mimeparse.cpp
@@ -62,8 +57,10 @@ SUBST_FILES.base64+= query/dynconf.h
 SUBST_FILES.base64+=   query/dynconf.cpp
 
 pre-configure:
+       ${LN} -sf ${PREFIX}/qt5/bin/qmake ${BUILDLINK_DIR}/bin/
        ${MV} ${WRKSRC}/utils/base64.h ${WRKSRC}/utils/recoll_base64.h
 
+.include "../../devel/meson/build.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/chmlib/buildlink3.mk"
@@ -80,6 +77,6 @@ pre-configure:
 .include "../../textproc/xapian/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/recoll/PLIST
diff -u pkgsrc/sysutils/recoll/PLIST:1.2 pkgsrc/sysutils/recoll/PLIST:1.3
--- pkgsrc/sysutils/recoll/PLIST:1.2    Thu Feb  1 09:29:17 2024
+++ pkgsrc/sysutils/recoll/PLIST        Wed Nov 13 13:55:37 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2024/02/01 09:29:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/11/13 13:55:37 wiz Exp $
 bin/recoll
 bin/recollindex
 bin/recollq
@@ -24,31 +24,25 @@ include/recoll/reslistpager.h
 include/recoll/searchdata.h
 include/recoll/smallut.h
 include/recoll/wasatorcl.h
-lib/librecoll.la
-${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+lib/librecoll.so
+lib/librecoll.so.39
+lib/librecoll.so.39.1.0
 ${PYSITELIB}/recoll/__init__.py
 ${PYSITELIB}/recoll/__init__.pyc
 ${PYSITELIB}/recoll/_recoll.so
 ${PYSITELIB}/recoll/conftree.py
 ${PYSITELIB}/recoll/conftree.pyc
+${PYSITELIB}/recoll/fsudi.py
+${PYSITELIB}/recoll/fsudi.pyc
+${PYSITELIB}/recoll/qresultstore.py
+${PYSITELIB}/recoll/qresultstore.pyc
 ${PYSITELIB}/recoll/rclconfig.py
 ${PYSITELIB}/recoll/rclconfig.pyc
 ${PYSITELIB}/recoll/rclextract.py
 ${PYSITELIB}/recoll/rclextract.pyc
 ${PYSITELIB}/recoll/recoll.py
 ${PYSITELIB}/recoll/recoll.pyc
-${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/recollaspell.so
-${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/recollchm/__init__.py
 ${PYSITELIB}/recollchm/__init__.pyc
 ${PYSITELIB}/recollchm/_chmlib.so
@@ -56,14 +50,14 @@ ${PYSITELIB}/recollchm/chm.py
 ${PYSITELIB}/recollchm/chm.pyc
 ${PYSITELIB}/recollchm/chmlib.py
 ${PYSITELIB}/recollchm/chmlib.pyc
-${PYSITELIB}/recollchm/extra.so
 man/man1/recoll.1
 man/man1/recollindex.1
 man/man1/recollq.1
+man/man1/xadump.1
 man/man5/recoll.conf.5
 share/applications/recoll-searchgui.desktop
 share/icons/hicolor/48x48/apps/recoll.png
-share/metainfo/recoll.appdata.xml
+share/metainfo/org.recoll.recoll.appdata.xml
 share/pixmaps/recoll.png
 share/recoll/doc/docbook-xsl.css
 share/recoll/doc/usermanual.html
@@ -90,7 +84,6 @@ share/recoll/filters/cnsplitter.py
 share/recoll/filters/conftree.py
 share/recoll/filters/fb2.xsl
 share/recoll/filters/gnumeric.xsl
-share/recoll/filters/hotrecoll.py
 share/recoll/filters/kosplitter.py
 share/recoll/filters/msodump.zip
 share/recoll/filters/okular-note.xsl
@@ -132,10 +125,13 @@ share/recoll/filters/rclkar.py
 share/recoll/filters/rclkwd
 share/recoll/filters/rcllatinclass.py
 share/recoll/filters/rcllatinstops.zip
+share/recoll/filters/rcllink.py
 share/recoll/filters/rcllyx
 share/recoll/filters/rclman
+share/recoll/filters/rclmd.py
 share/recoll/filters/rclmidi.py
 share/recoll/filters/rclnamefilter.py
+share/recoll/filters/rclnull.py
 share/recoll/filters/rclocr.py
 share/recoll/filters/rclocrabbyy.py
 share/recoll/filters/rclocrcache.py
@@ -156,6 +152,7 @@ share/recoll/filters/rclshowinfo
 share/recoll/filters/rcltar.py
 share/recoll/filters/rcltex
 share/recoll/filters/rcltext.py
+share/recoll/filters/rcltxtlines.py
 share/recoll/filters/rcluncomp
 share/recoll/filters/rcluncomp.py
 share/recoll/filters/rclwar.py

Index: pkgsrc/sysutils/recoll/distinfo
diff -u pkgsrc/sysutils/recoll/distinfo:1.3 pkgsrc/sysutils/recoll/distinfo:1.4
--- pkgsrc/sysutils/recoll/distinfo:1.3 Thu Feb  1 09:29:17 2024
+++ pkgsrc/sysutils/recoll/distinfo     Wed Nov 13 13:55:37 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2024/02/01 09:29:17 wiz Exp $
+$NetBSD: distinfo,v 1.4 2024/11/13 13:55:37 wiz Exp $
 
-BLAKE2s (recoll-1.37.2.tar.gz) = e84f0309537d9af17973d788fa0b198e8418fcd187cbbfdf38683077d8df0502
-SHA512 (recoll-1.37.2.tar.gz) = 88e381ba657614701e95e6923a984f65e3ebdf8341899cf6aea8d62665334372fa0edcde5f7a672f4ebc07a8be52564e06bfca656e720d3bdc6bffef720ea3b1
-Size (recoll-1.37.2.tar.gz) = 3134742 bytes
+BLAKE2s (recoll-1.40.3.tar.gz) = 9f4ce496510e75b007a8a62d6ceb69216f3c5c8b53ba2c5025c826d10dd77b7e
+SHA512 (recoll-1.40.3.tar.gz) = 1f374e2f3ff721cdacd146d96e404d59554587ec30da63ffda8c9075a0b4407f70714e96a2ab3d7963f5d848096e5f295dc80bd7254ad8109e1e93732a8556a2
+Size (recoll-1.40.3.tar.gz) = 3217280 bytes
+SHA1 (patch-qtgui_qmkmk.sh) = 6cc8b508d2844329177e210ff821799a13a77eed

Added files:

Index: pkgsrc/sysutils/recoll/patches/patch-qtgui_qmkmk.sh
diff -u /dev/null pkgsrc/sysutils/recoll/patches/patch-qtgui_qmkmk.sh:1.1
--- /dev/null   Wed Nov 13 13:55:37 2024
+++ pkgsrc/sysutils/recoll/patches/patch-qtgui_qmkmk.sh Wed Nov 13 13:55:37 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-qtgui_qmkmk.sh,v 1.1 2024/11/13 13:55:37 wiz Exp $
+
+Hardcode ncpus to 2.
+The sysctl|awk results in "=" on NetBSD, and we don't
+want this to scale to ncpus in bulk build environment anyway.
+
+--- qtgui/qmkmk.sh.orig        2024-11-13 13:23:22.684636962 +0000
++++ qtgui/qmkmk.sh
+@@ -13,16 +13,6 @@ QMAKE=${QMAKE:-qmake}
+ MAKE=${MAKE:-make}
+ 
+ ncpus=2
+-if which nproc > /dev/null ; then
+-    ncpus=`nproc`
+-elif which sysctl > /dev/null ; then
+-    ncpus=`sysctl hw.ncpu | awk '{print $2}'`
+-elif test -f /proc/cpuinfo ; then
+-    ncpus=`grep -E '^processor[        ]*:' /proc/cpuinfo | wc -l`
+-fi
+-if test -z "$ncpus" ; then
+-    ncpus=1
+-fi
+ 
+ cd $dir
+ ${QMAKE} $fn $*