bump(main/recoll): 1.39.2

Remove meson.build.patch file which was added in upstream
f9e6379138

Remove python-recoll-setup.py.in.diff file which was changed in upstream
e0d70a5b10
This commit is contained in:
termux-pacman-bot
2024-07-16 14:08:57 +00:00
parent 5441877bfa
commit 468bb60fc9
3 changed files with 2 additions and 31 deletions

View File

@@ -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
}

View File

@@ -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

View File

@@ -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']