From 0eb6ca8764a6878c040999f9da9eb28f3837851f Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Wed, 9 Oct 2019 15:04:43 +0200
Subject: [PATCH] macports: fix the clang stdlib fix

---
 packaging/macports/textproc/recoll/Portfile       | 11 +++++++----
 .../recoll/files/patch-sampleconf-mimeview.diff   | 15 +++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packaging/macports/textproc/recoll/Portfile b/packaging/macports/textproc/recoll/Portfile
index b6f07847..880a8491 100644
--- a/packaging/macports/textproc/recoll/Portfile
+++ b/packaging/macports/textproc/recoll/Portfile
@@ -21,9 +21,9 @@ long_description    Recoll is a desktop search tool based on Xapian
 homepage            http://www.recoll.org/
 master_sites        ${homepage}
 
-checksums           rmd160  88aebac6074f3e6242770348ac30e405975effa6 \
-                    sha256  500d114952aa03c222847df8ecd0f9c58fc1d03b940df72de81e02e52ca905bc \
-                    size 2849390
+checksums           rmd160  9ccf53ac498e937d37054727e963f57e341c539c \
+                    sha256  dcf74625a7148f04befd99706da8e7b26dab43a1092883abf5211422a15c5385 \
+                    size 2853970
 
 depends_lib         port:xapian-core \
                     port:aspell \
@@ -42,12 +42,15 @@ patchfiles          patch-sampleconf-mimeview.diff \
     patch-recoll-pro-stdlib.diff
 
 post-patch {
+    set clang_stdlib ""
+    
     if {[string match *clang* ${configure.compiler}]} {
         set clang_stdlib -stdlib=${configure.cxx_stdlib}
-        reinplace "s|@@STDLIB@@|${clang_stdlib}|g" qtgui/recoll.pro.in
     }
+    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 \
diff --git a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
index 05e03c8a..b6a7f6f4 100644
--- a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
+++ b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
@@ -1,4 +1,4 @@
---- sampleconf/mimeview	2019-09-17 18:28:40.000000000 +0200
+--- 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 @@
  ## ##########################################
@@ -8,12 +8,12 @@
  
  # 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,15 +20,15 @@
+@@ -19,18 +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 \
+- text/html|gnuinfo text/html|chm text/html|epub text/html|rclman \
 - application/x-fsdirectory|parentopen inode/directory|parentopen
 +#xallexcepts = application/pdf application/postscript application/x-dvi \
 +# text/html|gnuinfo text/html|chm text/html|epub \
@@ -24,11 +24,14 @@
  # 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
+-# But do use the uncoded url for help (F1) because the fragment in there must
+-# actually be processed.
+-text/html|rclman = 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
-@@ -160,21 +161,21 @@
+@@ -163,21 +161,21 @@
  application/zip = ark %f
  application/x-7z-compressed = ark %f
  
@@ -65,7 +68,7 @@
  
  # Or firefox -remote "openFile(%u)"
  text/html = firefox %u
-@@ -189,18 +190,18 @@
+@@ -192,18 +190,18 @@
  application/x-webarchive = konqueror %f
  text/x-fictionbook = ebook-viewer %f
  
@@ -96,7 +99,7 @@
  text/x-csv = libreoffice %f
  text/x-html-sidux-man = konqueror %f
  text/x-html-aptosid-man = iceweasel %f
-@@ -211,22 +212,22 @@
+@@ -214,22 +212,22 @@
  # file at the right place
  text/html|chm = kchmviewer --url %i %F