bump(main/recoll): 1.40.4

termux · Nov 17, 2024 · 2adb86b · 2adb86b
1 parent f596b0b
commit 2adb86b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/recoll/build.sh b/packages/recoll/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.recoll.org/
 TERMUX_PKG_DESCRIPTION="Full-text search for your desktop"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.40.3"
+TERMUX_PKG_VERSION="1.40.4"
 TERMUX_PKG_SRCURL=https://www.recoll.org/recoll-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=cb7d9ed9b95bc4527dc2ff67b3521970e65e4200cc0007139e26e107817703b4
+TERMUX_PKG_SHA256=a48503c4b0040dc1a476340cb7a1afb34366c21ae665bdad3c9ef8958845c1fa
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="aspell, file, libc++, libiconv, libxapian, libxml2, libxslt, zlib"
 TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"

diff --git a/packages/recoll/fix-hardcoded-paths.patch b/packages/recoll/fix-hardcoded-paths.patch
@@ -106,21 +106,21 @@
  [Install]
 --- a/python/recoll/recoll/rclconfig.py
 +++ b/python/recoll/recoll/rclconfig.py
-@@ -84,14 +84,14 @@
+@@ -93,14 +93,14 @@
                      # On ux platforms, the datadir value is set by "configure" in the C code.
                      # Try to guess
-                     #msg("Trying to guess datadir")
+                     # msg("Trying to guess datadir")
 -                    dirs = ("/opt/local", "/opt", "/usr", "/usr/local", "/usr/pkg")
 +                    dirs = ("@TERMUX_PREFIX@/opt/local", "@TERMUX_PREFIX@/opt", "@TERMUX_PREFIX@", "@TERMUX_PREFIX@/local", "@TERMUX_PREFIX@/pkg")
                      for dir in dirs:
                          dd = os.path.join(dir, "share/recoll")
                          if os.path.exists(dd):
                              self.datadir = dd
          if self.datadir is None:
-             #msg("DATADIR could not be computed. Trying /usr/share/recoll as last resort")
+             # msg("DATADIR could not be computed. Trying /usr/share/recoll as last resort")
 -            self.datadir = "/usr/share/recoll"
 +            self.datadir = "@TERMUX_PREFIX@/share/recoll"
-         #msg(f"DATADIR: [{self.datadir}]")
+         # msg(f"DATADIR: [{self.datadir}]")
          baseconfdir = os.path.join(self.datadir, "examples")
          f = None
 --- a/sampleconf/mimemap