From a66f9a978a45bdeeaf1188bb3dc4b033a8b50964 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 27 Sep 2019 11:39:28 +0200 Subject: [PATCH] macports: update master with relevant parts of 1.25 update --- packaging/macports/textproc/recoll/Portfile | 42 ++++--- .../recoll/files/patch-recoll-pro-stdlib.diff | 12 ++ .../files/patch-sampleconf-mimeview.diff | 105 ++++++++++-------- 3 files changed, 97 insertions(+), 62 deletions(-) create mode 100644 packaging/macports/textproc/recoll/files/patch-recoll-pro-stdlib.diff diff --git a/packaging/macports/textproc/recoll/Portfile b/packaging/macports/textproc/recoll/Portfile index 3aade3c9..b6f07847 100644 --- a/packaging/macports/textproc/recoll/Portfile +++ b/packaging/macports/textproc/recoll/Portfile @@ -2,13 +2,17 @@ PortSystem 1.0 PortGroup app 1.0 +PortGroup qt5 1.0 +PortGroup cxx11 1.1 + +qt5.depends_component qtwebkit name recoll -version 1.25.0 +version 1.26.0 categories textproc platforms darwin license GPL-2+ -maintainers dockes.org:jf openmaintainer +maintainers {dockes.org:jf @medoc92} openmaintainer description Desktop full text search @@ -17,35 +21,41 @@ long_description Recoll is a desktop search tool based on Xapian homepage http://www.recoll.org/ master_sites ${homepage} -checksums rmd160 2518c8ce8cf5661985283c153c20b1caec9e5860 \ - sha256 f1552961dd0cfd1a12d95fab1bf4990846df2085ddeaa5e832442bbce35acad2 \ - size 2675171 +checksums rmd160 88aebac6074f3e6242770348ac30e405975effa6 \ + sha256 500d114952aa03c222847df8ecd0f9c58fc1d03b940df72de81e02e52ca905bc \ + size 2849390 depends_lib port:xapian-core \ - port:qt5 \ - port:qt5-qtwebkit \ port:aspell \ port:libiconv \ port:zlib depends_run port:antiword \ - port:py27-libxml2 \ - port:py27-libxslt \ + port:python37 \ + port:py37-lxml \ port:poppler \ port:unrtf \ port:unzip patchfiles patch-sampleconf-mimeview.diff \ - patch-mkin-no-no-undefined.diff + patch-mkin-no-no-undefined.diff \ + patch-recoll-pro-stdlib.diff + +post-patch { + if {[string match *clang* ${configure.compiler}]} { + set clang_stdlib -stdlib=${configure.cxx_stdlib} + reinplace "s|@@STDLIB@@|${clang_stdlib}|g" qtgui/recoll.pro.in + } +} # Note: this is probably not the right way to configure QMAKE -configure.args QMAKE=${prefix}/libexec/qt5/bin/qmake \ - --without-x \ - --disable-x11mon \ - --disable-python-module \ - --disable-python-chm +configure.args QMAKE=${prefix}/libexec/qt5/bin/qmake \ + --without-x \ + --disable-x11mon \ + --disable-python-module \ + --disable-python-chm -build.args CC=${configure.cc} CXX=${configure.cxx} +build.args CC=${configure.cc} CXX=${configure.cxx} CPPFLAGS=-DMACPORTS=1 pre-destroot { xinstall -m 755 ${worksrcpath}/qtgui/recoll.app/Contents/MacOS/recoll ${destroot}${prefix}/bin/${name} diff --git a/packaging/macports/textproc/recoll/files/patch-recoll-pro-stdlib.diff b/packaging/macports/textproc/recoll/files/patch-recoll-pro-stdlib.diff new file mode 100644 index 00000000..0a49fbd6 --- /dev/null +++ b/packaging/macports/textproc/recoll/files/patch-recoll-pro-stdlib.diff @@ -0,0 +1,12 @@ +diff --git a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in +index f69aaa27..218c89b2 100644 +--- qtgui/recoll.pro.in ++++ qtgui/recoll.pro.in +@@ -148,6 +148,7 @@ contains( UNAME, SunOS ) { + + macx { + ICON = images/recoll.icns ++ LIBS += @@STDLIB@@ + } + + TRANSLATIONS = \ diff --git a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff index 07786f96..05e03c8a 100644 --- a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff +++ b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff @@ -1,66 +1,76 @@ ---- sampleconf/mimeview 2018-11-29 13:33:09.000000000 +0100 -+++ sampleconf/mimeview.mac 2018-11-29 16:38:52.000000000 +0100 -@@ -2,7 +2,8 @@ - +--- sampleconf/mimeview 2019-09-17 18:28:40.000000000 +0200 ++++ sampleconf/mimeview.mac 2019-09-17 18:20:09.000000000 +0200 +@@ -3,6 +3,7 @@ ## ########################################## # External viewers, launched by the recoll GUI when you click on a result --# 'edit' link -+# 'Open' link - MAC version + # 'edit' link +# 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 -@@ -16,22 +17,17 @@ - # search string - # - 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 -- +@@ -19,15 +20,15 @@ + # Use xallexcepts- and xallexcepts+ in a user file to add or remove from + # the default xallexcepts list + -xallexcepts = application/pdf application/postscript application/x-dvi \ - text/html|gnuinfo text/html|chm text/html|epub \ - application/x-fsdirectory|parentopen inode/directory|parentopen -- +#xallexcepts = application/pdf application/postscript application/x-dvi \ -+# text/html|gnuinfo text/html|chm text/html|epub ++# text/html|gnuinfo text/html|chm text/html|epub \ ++# application/x-fsdirectory|parentopen inode/directory|parentopen + [view] - # Pseudo entry used if the 'use desktop' preference is set in the GUI --application/x-all = xdg-open %u + # Pseudo entry used if the 'use desktop' preference is set in the GUI. + # Note that we use %U to url-encode the parameter +-application/x-all = xdg-open %U +application/x-all = open %f application/epub+zip = ebook-viewer %f --# 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 -+# 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 - - application/x-gnote = gnote %f - -@@ -146,12 +142,11 @@ + # Open the parent epub document for epub parts instead of opening them as +@@ -160,21 +161,21 @@ application/zip = ark %f application/x-7z-compressed = ark %f +-application/javascript = emacsclient --no-wait %f -application/x-awk = emacsclient --no-wait %f +-application/x-bibtex = emacsclient --no-wait %f +-application/x-csharp = emacsclient --no-wait %f +-application/x-java = emacsclient --no-wait %f -application/x-perl = emacsclient --no-wait %f --text/x-perl = emacsclient --no-wait %f +-application/x-php = 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-shellscript = emacsclient --no-wait %f -text/x-srt = emacsclient --no-wait %f ++application/javascript = emacsclient %f +application/x-awk = emacsclient %f ++application/x-bibtex = emacsclient %f ++application/x-csharp = emacsclient %f ++application/x-java = emacsclient %f +application/x-perl = emacsclient %f -+text/x-perl = emacsclient %f ++application/x-php = 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-shellscript = emacsclient %f ++text/x-srt = emacsclient %f # Or firefox -remote "openFile(%u)" text/html = firefox %u -@@ -163,16 +158,15 @@ - +@@ -189,18 +190,18 @@ application/x-webarchive = konqueror %f text/x-fictionbook = ebook-viewer %f + +-application/x-javascript = emacsclient --no-wait %f +-application/sql = emacsclient --no-wait %f -application/x-tex = emacsclient --no-wait %f -application/xml = emacsclient --no-wait %f -text/xml = emacsclient --no-wait %f @@ -71,32 +81,35 @@ -text/x-lua = emacsclient --no-wait %f -text/x-c+ = emacsclient --no-wait %f -text/x-c++ = emacsclient --no-wait %f -+application/x-tex = emacsclient %f -+application/xml = emacsclient %f -+text/xml = emacsclient %f -+text/x-tex = emacsclient %f -+text/plain = emacsclient %f -+text/x-awk = emacsclient %f -+text/x-c = emacsclient %f -+text/x-c+ = emacsclient %f -+text/x-c++ = emacsclient %f ++application/x-javascript = emacsclient %f ++application/sql = emacsclient %f ++application/x-tex = emacsclient %f ++application/xml = emacsclient %f ++text/xml = emacsclient %f ++text/x-tex = emacsclient %f ++text/plain = emacsclient %f ++text/x-awk = emacsclient %f ++text/x-c = emacsclient %f ++text/x-lua = emacsclient %f ++text/x-c+ = emacsclient %f ++text/x-c++ = emacsclient %f text/x-csv = libreoffice %f text/x-html-sidux-man = konqueror %f text/x-html-aptosid-man = iceweasel %f -@@ -183,22 +177,21 @@ +@@ -211,22 +212,22 @@ # file at the right place text/html|chm = kchmviewer --url %i %F -text/x-ini = emacsclient --no-wait %f -+text/x-ini = emacsclient %f ++text/x-ini = emacsclient %f 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 -+text/x-gaim-log = emacsclient %f -+text/x-purple-html-log = emacsclient %f -+text/x-purple-log = emacsclient %f ++text/x-gaim-log = emacsclient %f ++text/x-purple-html-log = emacsclient %f ++text/x-purple-log = emacsclient %f # The video types will usually be handled by the desktop default, but they # need entries here to get an "Open" link @@ -109,7 +122,6 @@ -video/x-matroska = vlc %f -video/x-ms-asf = vlc %f -video/x-msvideo = vlc %f -- +video/3gpp = open %f +video/mp2p = open %f +video/mp2t = open %f @@ -119,3 +131,4 @@ +video/x-matroska = open %f +video/x-ms-asf = open %f +video/x-msvideo = open %f +