<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00ac1bbf9d5087273740d7de7883d24ec58405d7">https://github.com/macports/macports-ports/commit/00ac1bbf9d5087273740d7de7883d24ec58405d7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 00ac1bb recoll: update to version 1.24.4
</span>00ac1bb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 00ac1bbf9d5087273740d7de7883d24ec58405d7
</span>Author: Jean-Francois Dockes <jf@dockes.org>
AuthorDate: Sun Dec 2 19:08:05 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> recoll: update to version 1.24.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 1.24.4
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix preview tool issues on mac os x
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix issues with loading libaspell
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52576
</span>---
textproc/recoll/Portfile | 40 +--
.../recoll/files/patch-mkin-no-no-undefined.diff | 12 +
textproc/recoll/files/patch-py2-to-27.diff | 340 +++++++++++++++++++++
textproc/recoll/files/patch-rclaspell-dylib.diff | 68 +++++
.../recoll/files/patch-sampleconf-mimeview.diff | 68 +----
5 files changed, 455 insertions(+), 73 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/recoll/Portfile b/textproc/recoll/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 62e7b8d..a6c3c38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/recoll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/recoll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup app 1.0
name recoll
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.21.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.24.4
</span> categories textproc
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,38 +14,43 @@ description Desktop full text search
</span>
long_description Recoll is a desktop search tool based on Xapian
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.lesbonscomptes.com/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.recoll.org/
</span> master_sites ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ac53ac320a6126e895104a78d1cd9b0baeeae283 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:bison
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5ad33e308a759f588cea3cdb1646e928ad0d474f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 989c1ecdce36082020c0d404a6223005cd166011f9c9b28ac762af978ef9392c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2674060
</span>
depends_lib port:xapian-core \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt4-mac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtwebkit \
</span> port:aspell \
port:libiconv \
port:zlib
depends_run port:antiword \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:catdoc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-libxslt \
</span> port:poppler \
port:unrtf \
port:unzip
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-sampleconf-mimeview.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTDIR=${prefix}/libexec/qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-sampleconf-mimeview.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mkin-no-no-undefined.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-rclaspell-dylib.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-py2-to-27.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --without-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-x11mon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: this is probably not the right way to configure QMAKE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args QMAKE=${prefix}/libexec/qt5/bin/qmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-x11mon \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python-module
</span>
build.args CC=${configure.cc} CXX=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/qtgui/recoll.app/Contents/MacOS/recoll ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # g++-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ">(\\d+(?:\\.\\d+)*)<"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/recoll/files/patch-mkin-no-no-undefined.diff b/textproc/recoll/files/patch-mkin-no-no-undefined.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..40b7524
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/recoll/files/patch-mkin-no-no-undefined.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in 2018-11-15 19:07:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in.new 2018-11-29 17:08:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -720,8 +720,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We use -release: the lib is only shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # between recoll programs from the same release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -version-info $(VERSION_INFO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-librecoll_la_LDFLAGS = -release $(VERSION) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,--no-undefined -Wl,--warn-unresolved-symbols
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++librecoll_la_LDFLAGS = -release $(VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ librecoll_la_LIBADD = $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ recollindex_SOURCES = \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/recoll/files/patch-py2-to-27.diff b/textproc/recoll/files/patch-py2-to-27.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..31d97ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/recoll/files/patch-py2-to-27.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,340 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/ppt-dump.py filters/ppt-dump.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f41a9f39..dc3085a4 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/ppt-dump.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/ppt-dump.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This Source Code Form is subject to the terms of the Mozilla Public
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License, v. 2.0. If a copy of the MPL was not distributed with this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcl7z filters/rcl7z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c68c8bcb..ac50c4ec 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcl7z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcl7z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 7-Zip file filter for Recoll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclaudio filters/rclaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 94ca0be7..08d6375a 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Audio tag filter for Recoll, using mutagen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclchm filters/rclchm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f9811c37..3bc9b16d 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclchm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclchm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Extract Html files from a Microsoft Compiled Html Help file (.chm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Needs at least python 2.2 for HTMLParser (chmlib needs 2.2 too)"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcldia filters/rcldia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 282148eb..a480294b 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcldia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcldia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -*- coding: utf-8 -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcldjvu.py filters/rcldjvu.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c5397195..0be01452 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcldjvu.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcldjvu.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2016 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcldoc.py filters/rcldoc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8fa1831..b92b185d 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcldoc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcldoc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import rclexecm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclepub filters/rclepub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8042d7f9..51786af1 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclepub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclepub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Extract Html content from an EPUB file (.epub)"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclepub1 filters/rclepub1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bd44f635..a7ea6c06 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclepub1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclepub1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Extract Html content from an EPUB file (.chm), concatenating all sections"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclics filters/rclics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ef04f2d..de177024 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Read an ICS file, break it into "documents" which are events, todos,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclimg.py filters/rclimg.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7eb1da91..4eb6c9b0 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclimg.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclimg.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python-based Image Tag extractor for Recoll. This is less thorough
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # than the Perl-based rclimg script, but useful if you don't want to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclinfo filters/rclinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f353d19e..36cf34e0 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Read a file in GNU info format and output its nodes as subdocs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # interfacing with recoll execm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclkar filters/rclkar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d6570dd5..34b8d2a2 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclkar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclkar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Read a .kar midi karaoke file and translate to recoll indexable format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This does not work with Python3 yet because python:midi doesn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcllatinclass.py filters/rcllatinclass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3f8b8634..e6b0fbee 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcllatinclass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcllatinclass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Try to guess a text's language and character set by checking how it matches lists of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common words. This is not a primary method of detection because it's slow and unreliable, but it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ may be a help in discrimating, for exemple, before european languages using relatively close
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclopxml.py filters/rclopxml.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b7f7fe83..4f1803c1 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclopxml.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclopxml.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2015 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclpdf.py filters/rclpdf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1e6852ea..47b09534 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclpdf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclpdf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclppt.py filters/rclppt.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a4e50265..993bc56c 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclppt.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclppt.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Recoll PPT text extractor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mso-dumper is not compatible with Python3. We use sys.executable to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclpython filters/rclpython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 615455b3..1e411890 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclpython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclpython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -*- coding: iso-8859-1 -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MoinMoin - Python source parser and colorizer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclrar filters/rclrar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8f723fa5..5f6adfb0 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclrar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclrar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Rar file filter for Recoll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Adapted from the Zip archive filter by mroark.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclrtf.py filters/rclrtf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e4b56d54..ffd0560e 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclrtf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclrtf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import rclexecm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclsoff-flat.py filters/rclsoff-flat.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 337a5f94..65bfa73a 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclsoff-flat.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclsoff-flat.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclsoff.py filters/rclsoff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5730d97c..4404a14b 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclsoff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclsoff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclsvg.py filters/rclsvg.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8c1b8aea..cee17324 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclsvg.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclsvg.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcltar filters/rcltar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d8bf100d..ab4b306e 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcltar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcltar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tar-file filter for Recoll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Thanks to Recoll user Martin Ziegler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcltext.py filters/rcltext.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 77359ff6..be410984 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcltext.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcltext.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Wrapping a text file. Recoll does it internally in most cases, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this is for use by another filter.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcltxtlines.py filters/rcltxtlines.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 220151fd..b2907364 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcltxtlines.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcltxtlines.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Index text lines as document (execm handler sample). This exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to demonstrate the execm interface and is not meant to be useful or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ efficient"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rcluncomp.py filters/rcluncomp.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 32a11c1a..eab3b257 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rcluncomp.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rcluncomp.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import rclexecm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclwar filters/rclwar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b654f3b3..301e28e9 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclwar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclwar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # WAR web archive filter for recoll. War file are gzipped tar files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclxls.py filters/rclxls.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c7b2343a..f8f10f8b 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclxls.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclxls.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extractor for Excel files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mso-dumper is not compatible with Python3. We use sys.executable to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclxml.py filters/rclxml.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 33ae8e3e..507851db 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclxml.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclxml.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclxmp.py filters/rclxmp.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 158e1222..602769af 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclxmp.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclxmp.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2016 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/rclzip filters/rclzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 35739625..0c597fbd 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/rclzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/rclzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/xls-dump.py filters/xls-dump.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index abffa330..57a8f113 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/xls-dump.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/xls-dump.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This Source Code Form is subject to the terms of the Mozilla Public
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License, v. 2.0. If a copy of the MPL was not distributed with this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git filters/xlsxmltocsv.py filters/xlsxmltocsv.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c9a5047..90ab06f2 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- filters/xlsxmltocsv.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ filters/xlsxmltocsv.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2015 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/recoll/files/patch-rclaspell-dylib.diff b/textproc/recoll/files/patch-rclaspell-dylib.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..802a6b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/recoll/files/patch-rclaspell-dylib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git aspell/rclaspell.cpp aspell/rclaspell.cpp-new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 698832df..4fd8b6b8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aspell/rclaspell.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aspell/rclaspell.cpp-new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,12 +71,16 @@ static std::mutex o_aapi_mutex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ badnames += #NM + string(" "); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const char *aspell_lib_suffixes[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ".so",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ".so.15",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ".so.16"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const vector<string> aspell_lib_suffixes {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ".15.dylib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ".dylib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ".so",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ".so.15",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ".so.16",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const unsigned int nlibsuffs = sizeof(aspell_lib_suffixes) / sizeof(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Stuff that we don't wish to see in the .h (possible sysdeps, etc.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class AspellData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,16 +164,39 @@ bool Aspell::init(string &reason)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Don't know what with Apple and (DY)LD_LIBRARY_PATH. Does not work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // So we look in all ../lib in the PATH...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vector<string> path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *pp = getenv("PATH");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stringToTokens(pp, path, ":");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reason = "Could not open shared library ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string libbase("libaspell");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string lib;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (unsigned int i = 0; i < nlibsuffs; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lib = libbase + aspell_lib_suffixes[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (const auto& suff : aspell_lib_suffixes) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lib = libbase + suff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reason += string("[") + lib + "] ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((m_data->m_handle = dlopen(lib.c_str(), RTLD_LAZY)) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reason.erase();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto found;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Above was the normal lookup: let dlopen search the directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Here is for Apple. Also look at all ../lib along the PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (const auto& dir : path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string lib1 = path_canon(dir + "/../lib/" + lib);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((m_data->m_handle = dlopen(lib1.c_str(), RTLD_LAZY)) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ reason.erase();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lib=lib1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto found;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ found:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/recoll/files/patch-sampleconf-mimeview.diff b/textproc/recoll/files/patch-sampleconf-mimeview.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ca3dd1..07786f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/recoll/files/patch-sampleconf-mimeview.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/recoll/files/patch-sampleconf-mimeview.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sampleconf/mimeview.orig 2015-09-28 00:08:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sampleconf/mimeview 2016-01-08 01:58:09.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sampleconf/mimeview 2018-11-29 13:33:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sampleconf/mimeview.mac 2018-11-29 16:38:52.000000000 +0100
</span> @@ -2,7 +2,8 @@
## ##########################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,13 +10,17 @@
</span>
# Mime types which we should not uncompress if they are found gzipped or
# bzipped because the native viewer knows how to handle. These would be
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,20 +17,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,22 +17,17 @@
</span> # search string
# - For pages of CHM and EPUB documents where we can choose to open the
# parent document instead of a temporary html file.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Use xallexcepts- and xallexcepts+ in a user file to add or remove from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# the default xallexcepts list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -xallexcepts = application/pdf application/postscript application/x-dvi \
- text/html|gnuinfo text/html|chm text/html|epub \
- application/x-fsdirectory|parentopen inode/directory|parentopen
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> +#xallexcepts = application/pdf application/postscript application/x-dvi \
+# text/html|gnuinfo text/html|chm text/html|epub
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,58 +33,13 @@
</span> -# Open the parent epub document for epub parts instead of opening them as
-# html documents. This is almost always what we want.
-text/html|epub = ebook-viewer %F;ignoreipath=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--application/x-gnote = gnote %f
</span> +# If you want to open the parent epub document for epub parts instead of
+# opening them as html documents:
+#text/html|epub = ebook-viewer %F;ignoreipath=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-mobipocket-ebook = ebook-viewer %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,9 +35,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-abiword = abiword %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/pdf = evince --page-index=%p --find=%s %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Or:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#application/pdf = qpdfview --search %s %f#%p
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/postscript = evince --page-index=%p --find=%s %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-dvi = evince --page-index=%p --find=%s %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,19 +74,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/vnd.wordperfect = libreoffice %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- text/rtf = libreoffice %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ application/x-gnote = gnote %f
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+application/x-chm = kchmviewer %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-dia-diagram = dia %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-fsdirectory = dolphin %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inode/directory = dolphin %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Both dolphin and nautilus can pre-select a file inside a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# directory. Thunar can't afaik. xdg-open cant pass an additional
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# parameters so these are to be xallexcepts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--application/x-fsdirectory|parentopen = dolphin --select %(childurl) %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inode/directory|parentopen = dolphin --select %(childurl) %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#application/x-fsdirectory|parentopen = nautilus %(childurl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#inode/directory|parentopen = nautilus %(childurl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-gnuinfo = xterm -e "info -f %f"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-gnumeric = gnumeric %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,11 +96,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image/x-ms-bmp = gwenview %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image/x-xpmi = gwenview %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Opening mail messages not always works.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# - Thunderbird will only open a single-message file if it has an .emf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# - "sylpheed %f" seems to work ok as of version 3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# - "kmail --view %u" works
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message/rfc822 = thunderbird -file %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- text/x-mail = thunderbird -file %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- application/x-mimehtml = thunderbird -file %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,11 +109,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,12 +142,11 @@
</span> application/zip = ark %f
application/x-7z-compressed = ark %f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +48,7 @@
</span> -text/x-perl = emacsclient --no-wait %f
-application/x-shellscript = emacsclient --no-wait %f
-text/x-shellscript = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-text/x-srt = emacsclient --no-wait %f
</span> +application/x-awk = emacsclient %f
+application/x-perl = emacsclient %f
+text/x-perl = emacsclient %f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +57,7 @@
</span>
# Or firefox -remote "openFile(%u)"
text/html = firefox %u
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,41 +125,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,16 +158,15 @@
</span>
application/x-webarchive = konqueror %f
text/x-fictionbook = ebook-viewer %f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +68,7 @@
</span> -text/plain = emacsclient --no-wait %f
-text/x-awk = emacsclient --no-wait %f
-text/x-c = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-text/x-lua = emacsclient --no-wait %f
</span> -text/x-c+ = emacsclient --no-wait %f
-text/x-c++ = emacsclient --no-wait %f
+application/x-tex = emacsclient %f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,10 +83,7 @@
</span> text/x-csv = libreoffice %f
text/x-html-sidux-man = konqueror %f
text/x-html-aptosid-man = iceweasel %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--application/x-chm = kchmviewer %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Html pages inside a chm have a chm rclaptg set by the filter. Kchmviewer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # knows how to use the ipath (which is the internal chm path) to open the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,22 +177,21 @@
</span> # file at the right place
text/html|chm = kchmviewer --url %i %F
</pre><pre style='margin:0'>
</pre>