<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/40371538d3b332cac921f895c4a9595efe35e65f">https://github.com/macports/macports-ports/commit/40371538d3b332cac921f895c4a9595efe35e65f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 40371538d3b332cac921f895c4a9595efe35e65f
</span>Author: Jean-Francois Dockes <jf@dockes.org>
AuthorDate: Fri Sep 20 12:10:36 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> recoll: update to version 1.25.22
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 1.25.22
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix the PATH to ensure that the GUI can find executables from the
</span><span style='display:block; white-space:pre;color:#404040;'> macports bin directory.
</span>---
textproc/recoll/Portfile | 20 +-
textproc/recoll/files/patch-py2-to-27.diff | 340 ---------------------
textproc/recoll/files/patch-rclaspell-dylib.diff | 68 -----
textproc/recoll/files/patch-rclinit-set-path.diff | 23 ++
.../recoll/files/patch-sampleconf-mimeview.diff | 105 ++++---
5 files changed, 92 insertions(+), 464 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/recoll/Portfile b/textproc/recoll/Portfile
</span>old mode 100644
new mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index c016c9c..5f86805
</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;'>@@ -7,7 +7,7 @@ PortGroup qt5 1.0
</span> qt5.depends_component qtwebkit
name recoll
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.24.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.25.22
</span> categories textproc
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description Recoll is a desktop search tool based on Xapian
</span> homepage http://www.recoll.org/
master_sites ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5ad33e308a759f588cea3cdb1646e928ad0d474f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 989c1ecdce36082020c0d404a6223005cd166011f9c9b28ac762af978ef9392c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2674060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 88aebac6074f3e6242770348ac30e405975effa6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 500d114952aa03c222847df8ecd0f9c58fc1d03b940df72de81e02e52ca905bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2849390
</span>
depends_lib port:xapian-core \
port:aspell \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,24 +30,24 @@ depends_lib port:xapian-core \
</span> port:zlib
depends_run port:antiword \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-lxml \
</span> port:poppler \
port:unrtf \
port:unzip
patchfiles patch-sampleconf-mimeview.diff \
patch-mkin-no-no-undefined.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-rclaspell-dylib.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-py2-to-27.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-rclinit-set-path.diff
</span>
# Note: this is probably not the right way to configure QMAKE
configure.args QMAKE=${prefix}/libexec/qt5/bin/qmake \
--without-x \
--disable-x11mon \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python-module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python-module \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python-chm
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc} CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC=${configure.cc} CXX=${configure.cxx} CPPFLAGS=-DMACPORTS=1
</span>
pre-destroot {
xinstall -m 755 ${worksrcpath}/qtgui/recoll.app/Contents/MacOS/recoll ${destroot}${prefix}/bin/${name}
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31d97ac..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/recoll/files/patch-py2-to-27.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,340 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/ppt-dump.py filters/ppt-dump.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f41a9f39..dc3085a4 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/ppt-dump.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/ppt-dump.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This Source Code Form is subject to the terms of the Mozilla Public
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # License, v. 2.0. If a copy of the MPL was not distributed with this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcl7z filters/rcl7z
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c68c8bcb..ac50c4ec 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcl7z
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcl7z
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 7-Zip file filter for Recoll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclaudio filters/rclaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 94ca0be7..08d6375a 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Audio tag filter for Recoll, using mutagen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclchm filters/rclchm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f9811c37..3bc9b16d 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclchm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclchm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Extract Html files from a Microsoft Compiled Html Help file (.chm)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Needs at least python 2.2 for HTMLParser (chmlib needs 2.2 too)"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcldia filters/rcldia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 282148eb..a480294b 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcldia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcldia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -*- coding: utf-8 -*-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcldjvu.py filters/rcldjvu.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c5397195..0be01452 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcldjvu.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcldjvu.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2016 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcldoc.py filters/rcldoc.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e8fa1831..b92b185d 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcldoc.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcldoc.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import rclexecm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclepub filters/rclepub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8042d7f9..51786af1 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclepub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclepub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Extract Html content from an EPUB file (.epub)"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclepub1 filters/rclepub1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bd44f635..a7ea6c06 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclepub1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclepub1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Extract Html content from an EPUB file (.chm), concatenating all sections"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclics filters/rclics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0ef04f2d..de177024 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Read an ICS file, break it into "documents" which are events, todos,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclimg.py filters/rclimg.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7eb1da91..4eb6c9b0 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclimg.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclimg.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python-based Image Tag extractor for Recoll. This is less thorough
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # than the Perl-based rclimg script, but useful if you don't want to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclinfo filters/rclinfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f353d19e..36cf34e0 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclinfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclinfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Read a file in GNU info format and output its nodes as subdocs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # interfacing with recoll execm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclkar filters/rclkar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6570dd5..34b8d2a2 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclkar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclkar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Read a .kar midi karaoke file and translate to recoll indexable format
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This does not work with Python3 yet because python:midi doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcllatinclass.py filters/rcllatinclass.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3f8b8634..e6b0fbee 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcllatinclass.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcllatinclass.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """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:#ffe0e0;'>- 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:#ffe0e0;'>- may be a help in discrimating, for exemple, before european languages using relatively close
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclopxml.py filters/rclopxml.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b7f7fe83..4f1803c1 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclopxml.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclopxml.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2015 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclpdf.py filters/rclpdf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1e6852ea..47b09534 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclpdf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclpdf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclppt.py filters/rclppt.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a4e50265..993bc56c 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclppt.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclppt.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Recoll PPT text extractor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mso-dumper is not compatible with Python3. We use sys.executable to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclpython filters/rclpython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 615455b3..1e411890 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclpython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclpython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -*- coding: iso-8859-1 -*-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MoinMoin - Python source parser and colorizer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclrar filters/rclrar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8f723fa5..5f6adfb0 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclrar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclrar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Rar file filter for Recoll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Adapted from the Zip archive filter by mroark.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclrtf.py filters/rclrtf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e4b56d54..ffd0560e 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclrtf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclrtf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import rclexecm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclsoff-flat.py filters/rclsoff-flat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 337a5f94..65bfa73a 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclsoff-flat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclsoff-flat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclsoff.py filters/rclsoff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5730d97c..4404a14b 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclsoff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclsoff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclsvg.py filters/rclsvg.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8c1b8aea..cee17324 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclsvg.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclsvg.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcltar filters/rcltar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d8bf100d..ab4b306e 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcltar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcltar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tar-file filter for Recoll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Thanks to Recoll user Martin Ziegler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcltext.py filters/rcltext.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 77359ff6..be410984 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcltext.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcltext.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Wrapping a text file. Recoll does it internally in most cases, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is for use by another filter.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcltxtlines.py filters/rcltxtlines.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 220151fd..b2907364 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcltxtlines.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcltxtlines.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Index text lines as document (execm handler sample). This exists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to demonstrate the execm interface and is not meant to be useful or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- efficient"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rcluncomp.py filters/rcluncomp.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 32a11c1a..eab3b257 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rcluncomp.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rcluncomp.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import rclexecm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclwar filters/rclwar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b654f3b3..301e28e9 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclwar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclwar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # WAR web archive filter for recoll. War file are gzipped tar files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclxls.py filters/rclxls.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c7b2343a..f8f10f8b 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclxls.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclxls.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extractor for Excel files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mso-dumper is not compatible with Python3. We use sys.executable to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclxml.py filters/rclxml.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 33ae8e3e..507851db 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclxml.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclxml.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclxmp.py filters/rclxmp.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 158e1222..602769af 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclxmp.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclxmp.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2016 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/rclzip filters/rclzip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 35739625..0c597fbd 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/rclzip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/rclzip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2014 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/xls-dump.py filters/xls-dump.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index abffa330..57a8f113 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/xls-dump.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/xls-dump.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This Source Code Form is subject to the terms of the Mozilla Public
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # License, v. 2.0. If a copy of the MPL was not distributed with this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git filters/xlsxmltocsv.py filters/xlsxmltocsv.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0c9a5047..90ab06f2 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- filters/xlsxmltocsv.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ filters/xlsxmltocsv.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2015 J.F.Dockes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 802a6b5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/recoll/files/patch-rclaspell-dylib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git aspell/rclaspell.cpp aspell/rclaspell.cpp-new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 698832df..4fd8b6b8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aspell/rclaspell.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aspell/rclaspell.cpp-new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,12 +71,16 @@ static std::mutex o_aapi_mutex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- badnames += #NM + string(" "); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const char *aspell_lib_suffixes[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ".so",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ".so.15",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ".so.16"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const vector<string> aspell_lib_suffixes {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ".15.dylib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ".dylib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ".so",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ".so.15",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ".so.16",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const unsigned int nlibsuffs = sizeof(aspell_lib_suffixes) / sizeof(char *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Stuff that we don't wish to see in the .h (possible sysdeps, etc.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class AspellData {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,16 +164,39 @@ bool Aspell::init(string &reason)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Don't know what with Apple and (DY)LD_LIBRARY_PATH. Does not work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // So we look in all ../lib in the PATH...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vector<string> path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *pp = getenv("PATH");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pp) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stringToTokens(pp, path, ":");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reason = "Could not open shared library ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string libbase("libaspell");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string lib;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (unsigned int i = 0; i < nlibsuffs; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lib = libbase + aspell_lib_suffixes[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& suff : aspell_lib_suffixes) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lib = libbase + suff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reason += string("[") + lib + "] ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((m_data->m_handle = dlopen(lib.c_str(), RTLD_LAZY)) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reason.erase();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto found;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Above was the normal lookup: let dlopen search the directories.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Here is for Apple. Also look at all ../lib along the PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& dir : path) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string lib1 = path_canon(dir + "/../lib/" + lib);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((m_data->m_handle = dlopen(lib1.c_str(), RTLD_LAZY)) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ reason.erase();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lib=lib1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto found;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- found:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/recoll/files/patch-rclinit-set-path.diff b/textproc/recoll/files/patch-rclinit-set-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4805a41
</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-rclinit-set-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git common/rclinit.cpp common/rclinit.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 45ba5741..e5eed5e2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/rclinit.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/rclinit.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -273,6 +273,18 @@ RclConfig *recollinit(int flags,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cleanup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ atexit(cleanup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MACPORTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Apple keeps changing the way to set the environment (PATH) for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // a desktop app (started by launchd or whatever). Life is too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // short.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *cp = getenv("PATH");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!cp) //??
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string PATH(cp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PATH = string("/opt/local/bin/") + ":" + PATH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setenv("PATH", PATH.c_str(), 1);
</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;'>+ // Make sure the locale is set. This is only for converting file names
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // to utf8 for indexing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setlocale(LC_CTYPE, "");
</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 07786f9..05e03c8 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,66 +1,76 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sampleconf/mimeview 2018-11-29 13:33:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sampleconf/mimeview.mac 2018-11-29 16:38:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sampleconf/mimeview 2019-09-17 18:28:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sampleconf/mimeview.mac 2019-09-17 18:20:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span> ## ##########################################
# External viewers, launched by the recoll GUI when you click on a result
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# 'edit' link
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# 'Open' link - MAC version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 'edit' link
</span> +# On the MAC, we use "open" for everything...
# 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,22 +17,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # search string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # - For pages of CHM and EPUB documents where we can choose to open the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # parent document instead of a temporary html file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Use xallexcepts- and xallexcepts+ in a user file to add or remove from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# the default xallexcepts list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,15 +20,15 @@
</span><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:#ffe0e0;'>--
</span> +#xallexcepts = application/pdf application/postscript application/x-dvi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# text/html|gnuinfo text/html|chm text/html|epub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# text/html|gnuinfo text/html|chm text/html|epub \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# application/x-fsdirectory|parentopen inode/directory|parentopen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
[view]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Pseudo entry used if the 'use desktop' preference is set in the GUI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--application/x-all = xdg-open %u
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Pseudo entry used if the 'use desktop' preference is set in the GUI.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note that we use %U to url-encode the parameter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/x-all = xdg-open %U
</span> +application/x-all = open %f
application/epub+zip = ebook-viewer %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# Open the parent epub document for epub parts instead of opening them as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# html documents. This is almost always what we want.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--text/html|epub = ebook-viewer %F;ignoreipath=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# If you want to open the parent epub document for epub parts instead of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# opening them as html documents:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#text/html|epub = ebook-viewer %F;ignoreipath=1
</span><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><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,12 +142,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Open the parent epub document for epub parts instead of opening them as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,21 +161,21 @@
</span> application/zip = ark %f
application/x-7z-compressed = ark %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/javascript = emacsclient --no-wait %f
</span> -application/x-awk = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/x-bibtex = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/x-csharp = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/x-java = emacsclient --no-wait %f
</span> -application/x-perl = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>--text/x-perl = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/x-php = emacsclient --no-wait %f
</span> -application/x-shellscript = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-text/x-bibtex = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-text/css = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-text/x-csharp = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-text/x-java = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-text/x-perl = emacsclient --no-wait %f
</span> -text/x-shellscript = emacsclient --no-wait %f
-text/x-srt = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>++application/javascript = emacsclient %f
</span> +application/x-awk = emacsclient %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>++application/x-bibtex = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++application/x-csharp = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++application/x-java = emacsclient %f
</span> +application/x-perl = emacsclient %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-perl = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++application/x-php = emacsclient %f
</span> +application/x-shellscript = emacsclient %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-bibtex = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/css = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-csharp = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-java = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-perl = emacsclient %f
</span> +text/x-shellscript = emacsclient %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-srt = emacsclient %f
</span>
# Or firefox -remote "openFile(%u)"
text/html = firefox %u
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,16 +158,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,18 +190,18 @@
</span> application/x-webarchive = konqueror %f
text/x-fictionbook = ebook-viewer %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/x-javascript = emacsclient --no-wait %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-application/sql = emacsclient --no-wait %f
</span> -application/x-tex = emacsclient --no-wait %f
-application/xml = emacsclient --no-wait %f
-text/xml = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,32 +81,35 @@
</span> -text/x-lua = emacsclient --no-wait %f
-text/x-c+ = emacsclient --no-wait %f
-text/x-c++ = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+application/x-tex = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+application/xml = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/xml = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-tex = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/plain = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-awk = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-c = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-c+ = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-c++ = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++application/x-javascript = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++application/sql = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++application/x-tex = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++application/xml = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/xml = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-tex = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/plain = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-awk = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-c = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-lua = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-c+ = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-c++ = emacsclient %f
</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;'>-@@ -183,22 +177,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,22 +212,22 @@
</span> # file at the right place
text/html|chm = kchmviewer --url %i %F
-text/x-ini = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-ini = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-ini = emacsclient %f
</span> text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
text/x-python = idle %f
-text/x-gaim-log = emacsclient --no-wait %f
-text/x-purple-html-log = emacsclient --no-wait %f
-text/x-purple-log = emacsclient --no-wait %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-gaim-log = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-purple-html-log = emacsclient %f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+text/x-purple-log = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-gaim-log = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-purple-html-log = emacsclient %f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++text/x-purple-log = emacsclient %f
</span>
# The video types will usually be handled by the desktop default, but they
# need entries here to get an "Open" link
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +122,6 @@
</span> -video/x-matroska = vlc %f
-video/x-ms-asf = vlc %f
-video/x-msvideo = vlc %f
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> +video/3gpp = open %f
+video/mp2p = open %f
+video/mp2t = open %f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,3 +131,4 @@
</span> +video/x-matroska = open %f
+video/x-ms-asf = open %f
+video/x-msvideo = open %f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>