diff --git a/packages/recoll/build.sh b/packages/recoll/build.sh index 3840d39686..4eb63606ee 100644 --- 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.39.1" +TERMUX_PKG_VERSION="1.39.2" TERMUX_PKG_SRCURL=https://www.recoll.org/recoll-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=11e69d8ff027bb3b426fb548604cb884a6ddb87dc2ccae77b400ef23df8f5a64 +TERMUX_PKG_SHA256=46d7fc7bc2664ad95ba851894380b7c016c195b45033281974fba0f90ec3b48d TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="aspell, file, libc++, libiconv, libxapian, libxml2, libxslt, zlib" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" @@ -23,9 +23,4 @@ termux_step_pre_configure() { LDFLAGS+=" $($CC -print-libgcc-file-name)" CXXFLAGS+=" -fPIC" CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${TERMUX_PYTHON_VERSION}/" - - echo "Applying python-recoll-setup.py.in.diff" - sed "s|@PYTHON_VERSION@|${TERMUX_PYTHON_VERSION}|g" \ - $TERMUX_PKG_BUILDER_DIR/python-recoll-setup.py.in.diff \ - | patch --silent -p1 } diff --git a/packages/recoll/meson.build.patch b/packages/recoll/meson.build.patch deleted file mode 100644 index 095705b382..0000000000 --- a/packages/recoll/meson.build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -58,7 +58,7 @@ - # Searching for iconv is a meson 0.60 feature. Hopefully, for now all the systems where the - # meson build is used have iconv in libc. Otherwise look at glib search for iconv for how to do - # it. -- #librecolldeps += dependency('iconv', method = 'auto') -+ librecolldeps += dependency('iconv', method: 'auto') - else - librecoll_needed = false - endif diff --git a/packages/recoll/python-recoll-setup.py.in.diff b/packages/recoll/python-recoll-setup.py.in.diff deleted file mode 100644 index 4ddb23f5e9..0000000000 --- a/packages/recoll/python-recoll-setup.py.in.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- a/python/recoll/setup.py.in -+++ b/python/recoll/setup.py.in -@@ -16,8 +16,8 @@ - # Ensure that we can build with an uninstalled lib from a build tree - library_dirs = [os.path.realpath(os.path.join(localtop, '.libs'))] - --if "CYGWIN" in os.environ: -- libraries = ['recoll', 'xapian', 'iconv', 'z'] -+if True: -+ libraries = ['recoll', 'python@PYTHON_VERSION@', 'xslt', 'xml2', 'xapian', 'iconv', 'z'] - else: - libraries = ['recoll'] -