diff --git a/packaging/macports/README.asc b/packaging/macports/README.asc index 30930869..39511abe 100644 --- a/packaging/macports/README.asc +++ b/packaging/macports/README.asc @@ -10,6 +10,11 @@ http://guide.macports.org/#development.local-repositories == Build Recoll +- Arrange to have the ports commands directory in your PATH, example for + sh/bash: + + export PATH=/opt/local/bin:$PATH + - Create a directory for the local ports repository and the recoll data. This could be anywhere but you do need the macports/textproc/recoll directories in the path. E.g.: diff --git a/packaging/macports/textproc/recoll/Portfile b/packaging/macports/textproc/recoll/Portfile index f9ee476d..5b8dcba5 100644 --- a/packaging/macports/textproc/recoll/Portfile +++ b/packaging/macports/textproc/recoll/Portfile @@ -3,12 +3,12 @@ PortSystem 1.0 PortGroup app 1.0 PortGroup qt5 1.0 -PortGroup cxx11 1.1 +compiler.cxx_standard 2011 qt5.depends_component qtwebkit name recoll -version 1.26.3 +version 1.26.7 categories textproc platforms darwin license GPL-2+ @@ -18,12 +18,12 @@ description Desktop full text search long_description Recoll is a desktop search tool based on Xapian -homepage http://www.recoll.org/ +homepage https://www.lesbonscomptes.com/recoll/ master_sites ${homepage} -checksums rmd160 5fa96d54a8f835105afb51f24296f3bffc74ad55 \ - sha256 396bebfc94c3df13ca9a65ef6ed08096eb6b48c08812465a907c028f6f3fe93d \ - size 2978628 +checksums rmd160 50f25961709ff3ee0ab39c72812f4c46a86dfdbc \ + sha256 0c7f6e420e345f0c7ea36c6898518f183cf97ab648d25ebe3ff16417b588e1a2 \ + size 3075386 depends_lib port:xapian-core \ port:aspell \ @@ -31,15 +31,16 @@ depends_lib port:xapian-core \ port:zlib depends_run port:antiword \ - port:python37 \ - port:py37-lxml \ + port:python39 \ + port:py39-lxml \ port:poppler \ port:unrtf \ port:unzip patchfiles patch-sampleconf-mimeview.diff \ patch-mkin-no-no-undefined.diff \ - patch-recoll-pro-stdlib.diff + patch-recoll-pro-stdlib.diff \ + patch-internfile-mh_xslt.diff post-patch { set clang_stdlib "" diff --git a/packaging/macports/textproc/recoll/files/patch-internfile-mh_xslt.diff b/packaging/macports/textproc/recoll/files/patch-internfile-mh_xslt.diff new file mode 100644 index 00000000..b1dcbcec --- /dev/null +++ b/packaging/macports/textproc/recoll/files/patch-internfile-mh_xslt.diff @@ -0,0 +1,18 @@ +--- internfile/mh_xslt.cpp.orig 2021-02-02 09:08:06.094415813 +0100 ++++ internfile/mh_xslt.cpp 2021-02-02 09:08:24.598257255 +0100 +@@ -14,11 +14,15 @@ + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include "autoconfig.h" + ++#if defined(HAVE_MALLOC_H) + #include ++#elif defined(HAVE_MALLOC_MALLOC_H) ++#include ++#endif + + #include + #include + #include + #include diff --git a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff index b6a7f6f4..89b4bd1d 100644 --- a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff +++ b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff @@ -1,6 +1,8 @@ ---- sampleconf/mimeview 2019-10-09 14:36:39.000000000 +0200 -+++ sampleconf/mimeview.mac 2019-09-17 18:20:09.000000000 +0200 -@@ -3,6 +3,7 @@ +--- sampleconf/mimeview 2020-04-02 14:50:29.000000000 +0200 ++++ sampleconf/mimeview.mac 2021-02-02 08:54:33.684741377 +0100 +@@ -1,10 +1,11 @@ + # @(#$Id: mimeview,v 1.16 2008-09-15 08:03:37 dockes Exp $ (C) 2004 J.F.Dockes + ## ########################################## # External viewers, launched by the recoll GUI when you click on a result # 'edit' link @@ -8,7 +10,11 @@ # 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 -@@ -19,18 +20,15 @@ + # exceptions and the list is normally empty + #nouncompforviewmts = +@@ -17,22 +18,19 @@ + # - For pages of CHM and EPUB documents where we can choose to open the + # parent document instead of a temporary html file. # Use xallexcepts- and xallexcepts+ in a user file to add or remove from # the default xallexcepts list @@ -31,7 +37,11 @@ application/epub+zip = ebook-viewer %f # Open the parent epub document for epub parts instead of opening them as -@@ -163,21 +161,21 @@ + # html documents. This is almost always what we want. + text/html|epub = ebook-viewer %F;ignoreipath=1 +@@ -162,27 +160,27 @@ + application/x-rar = ark %f + application/x-tar = ark %f application/zip = ark %f application/x-7z-compressed = ark %f @@ -42,12 +52,14 @@ -application/x-java = emacsclient --no-wait %f -application/x-perl = emacsclient --no-wait %f -application/x-php = emacsclient --no-wait %f +-application/x-ruby = emacsclient --no-wait %f -application/x-shellscript = emacsclient --no-wait %f -text/x-bibtex = emacsclient --no-wait %f -text/css = emacsclient --no-wait %f -text/x-csharp = emacsclient --no-wait %f -text/x-java = emacsclient --no-wait %f -text/x-perl = emacsclient --no-wait %f +-text/x-ruby = emacsclient --no-wait %f -text/x-shellscript = emacsclient --no-wait %f -text/x-srt = emacsclient --no-wait %f +application/javascript = emacsclient %f @@ -57,18 +69,24 @@ +application/x-java = emacsclient %f +application/x-perl = emacsclient %f +application/x-php = emacsclient %f ++application/x-ruby = emacsclient %f +application/x-shellscript = emacsclient %f +text/x-bibtex = emacsclient %f +text/css = emacsclient %f +text/x-csharp = emacsclient %f +text/x-java = emacsclient %f +text/x-perl = emacsclient %f ++text/x-ruby = emacsclient %f +text/x-shellscript = emacsclient %f +text/x-srt = emacsclient %f # Or firefox -remote "openFile(%u)" text/html = firefox %u -@@ -192,18 +190,18 @@ + application/x-chm-html = %u + text/x-chm-html = %u +@@ -193,46 +191,46 @@ + text/html|gnuinfo = rclshowinfo %F %(title);ignoreipath=1 + application/x-webarchive = konqueror %f text/x-fictionbook = ebook-viewer %f @@ -99,7 +117,10 @@ text/x-csv = libreoffice %f text/x-html-sidux-man = konqueror %f text/x-html-aptosid-man = iceweasel %f -@@ -214,22 +212,22 @@ + + application/x-chm = kchmviewer %f + # Html pages inside a chm have a chm rclaptg set by the filter. Kchmviewer + # knows how to use the ipath (which is the internal chm path) to open the # file at the right place text/html|chm = kchmviewer --url %i %F