CVS commit: pkgsrc/sysutils/recoll

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Oct  7 06:21:32 UTC 2023

Modified Files:
        pkgsrc/sysutils/recoll: Makefile distinfo
Added Files:
        pkgsrc/sysutils/recoll/patches: patch-python_recoll_recoll_rclconfig.py

Log Message:
recoll: add a bug fix from upstream

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/recoll/Makefile \
    pkgsrc/sysutils/recoll/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/recoll/patches/patch-python_recoll_recoll_rclconfig.py

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.1 pkgsrc/sysutils/recoll/Makefile:1.2
--- pkgsrc/sysutils/recoll/Makefile:1.1 Mon Oct  2 06:05:12 2023
+++ pkgsrc/sysutils/recoll/Makefile     Sat Oct  7 06:21:32 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2023/10/02 06:05:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2023/10/07 06:21:32 wiz Exp $
 
 DISTNAME=      recoll-1.35.0
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  http://www.lesbonscomptes.com/recoll/
 
Index: pkgsrc/sysutils/recoll/distinfo
diff -u pkgsrc/sysutils/recoll/distinfo:1.1 pkgsrc/sysutils/recoll/distinfo:1.2
--- pkgsrc/sysutils/recoll/distinfo:1.1 Mon Oct  2 06:05:12 2023
+++ pkgsrc/sysutils/recoll/distinfo     Sat Oct  7 06:21:32 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2023/10/02 06:05:12 wiz Exp $
+$NetBSD: distinfo,v 1.2 2023/10/07 06:21:32 wiz Exp $
 
 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
+SHA1 (patch-python_recoll_recoll_rclconfig.py) = 99aac68fbcf36e8bdc653ab7211f2e744a49d770
 SHA1 (patch-qtgui_recoll.pro.in) = e13244b57a7eebfb8978b9848a570d8a01a6f915
 SHA1 (patch-utils_pxattr.cpp) = dd0b60ae48891b455c23190ed2d85d852b8a5700

Added files:

Index: pkgsrc/sysutils/recoll/patches/patch-python_recoll_recoll_rclconfig.py
diff -u /dev/null pkgsrc/sysutils/recoll/patches/patch-python_recoll_recoll_rclconfig.py:1.1
--- /dev/null   Sat Oct  7 06:21:32 2023
+++ pkgsrc/sysutils/recoll/patches/patch-python_recoll_recoll_rclconfig.py      Sat Oct  7 06:21:32 2023
@@ -0,0 +1,56 @@
+$NetBSD: patch-python_recoll_recoll_rclconfig.py,v 1.1 2023/10/07 06:21:32 wiz Exp $
+
+From upstream.
+
+--- python/recoll/recoll/rclconfig.py.orig     2023-06-20 11:38:17.000000000 +0000
++++ python/recoll/recoll/rclconfig.py  2023-10-06 21:32:49.383889924 +0000
+@@ -46,42 +46,23 @@
+                 self.confdir = os.path.expanduser("~/.recoll")
+         #print("Confdir: [%s]" % self.confdir, file=sys.stderr)
+         
+-        # Also find datadir. This is trickier because this is set by
+-        # "configure" in the C code. We can only do our best. Have to
+-        # choose a preference order. Use RECOLL_DATADIR if the order is wrong
++        # Find datadir to get at the base configuration files. This could be a bit tricky because
++        # this is set by "configure" in the C code. Use RECOLL_DATADIR if the computed value is
++        # wrong.
+         self.datadir = None
+         if "RECOLL_DATADIR" in os.environ:
+             self.datadir = os.environ["RECOLL_DATADIR"]
+         else:
+-            if platsys == "Windows":
+-                dirs = (os.path.join(os.path.dirname(sys.argv[0]), "..", ".."),
+-                        "C:/Program Files (X86)/Recoll/",
+-                        "C:/Program Files/Recoll/",
+-                        "C:/install/recoll/")
+-                for dir in dirs:
+-                    if os.path.exists(os.path.join(dir, "Share")):
+-                        self.datadir = os.path.join(dir, "Share")
+-                        break
+-            elif platsys == "Darwin":
+-                # Actually, I'm not sure why we don't do this on all platforms
+-                self.datadir = os.path.join(os.path.dirname(sys.argv[0]), "..")
+-                #print("Mac datadir: [%s]" % self.datadir, file=sys.stderr)
+-            else:
+-                dirs = ("/opt/local", "/opt", "/usr", "/usr/local")
+-                for dir in dirs:
+-                    dd = os.path.join(dir, "share/recoll")
+-                    if os.path.exists(dd):
+-                        self.datadir = dd
+-        if self.datadir is None:
+-            self.datadir = "/usr/share/recoll"
++            self.datadir = os.path.join(os.path.dirname(sys.argv[0]), "..")
++        recollconf = os.path.join(self.datadir, "examples", "recoll.conf")
+         f = None
+         try:
+-            f = open(os.path.join(self.datadir, "examples", "recoll.conf"), "r")
++            f = open(recollconf, "r")
+         except:
+             pass
+         if f is None:
+             raise(Exception(
+-                "Can't open default/system recoll.conf. " +
++                f"Can't open default/system config: {recollconf} " +
+                 "Please set RECOLL_DATADIR in the environment to point " +
+                 "to the installed recoll data files."))
+         else: