From 303321e56876d851e946d0caf7df323dc2efb89f Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 10 Mar 2014 10:14:04 +0100
Subject: [PATCH] perform tilde expansion for dir: clauses. Closes issue #177

---
 packaging/homebrew/recoll.rb                | 22 ++++++++++++++++++---
 packaging/macports/textproc/recoll/Portfile | 13 +++++-------
 src/rcldb/searchdata.cpp                    |  2 ++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/packaging/homebrew/recoll.rb b/packaging/homebrew/recoll.rb
index 6b4fdc6f..bc2b2b9a 100644
--- a/packaging/homebrew/recoll.rb
+++ b/packaging/homebrew/recoll.rb
@@ -2,12 +2,14 @@ require 'formula'
 
 class Recoll < Formula
   homepage 'http://www.recoll.org'
-  url 'http://www.recoll.org/recoll-1.19.9.tar.gz'
-  sha1 'ab662057082eb889b196653c328440ed95bf9ac4'
+  url 'http://www.recoll.org/recoll-1.19.11p1.tar.gz'
+  sha1 'f4259c21faff9f30882d0bf1e8f952c19ed9936b'
 
   depends_on 'xapian'
   depends_on 'qt'
-
+  def patches
+   DATA 
+  end
   def install
     system "./configure", "--prefix=#{prefix}"
     system "make", "install"
@@ -17,3 +19,17 @@ class Recoll < Formula
     system "#{bin}/recollindex", "-h"
   end
 end
+
+__END__
+--- a/configure.orig	2014-01-07 12:39:40.606718201 +0100
++++ b/configure	2014-01-07 12:39:58.574599715 +0100
+@@ -5120,7 +5120,7 @@
+   # basically to enable using a Macbook for development
+   if test X$sys = XDarwin ; then
+      # The default is xcode
+-     QMAKE="${QMAKE} -spec macx-g++"
++     QMAKE="${QMAKE}"
+   fi
+
+   # Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
+
diff --git a/packaging/macports/textproc/recoll/Portfile b/packaging/macports/textproc/recoll/Portfile
index 69e9022e..850d19fe 100644
--- a/packaging/macports/textproc/recoll/Portfile
+++ b/packaging/macports/textproc/recoll/Portfile
@@ -1,11 +1,11 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
+# $Id: Portfile 111989 2013-10-08 17:10:55Z ryandesign@macports.org $
 
 PortSystem          1.0
 PortGroup           app 1.0
 
 name                recoll
-version             1.19.7
+version             1.19.11p1
 categories          textproc
 platforms           darwin
 license             GPL-2+
@@ -18,8 +18,8 @@ long_description    Recoll is a desktop search tool based on Xapian
 homepage            http://www.recoll.org/
 master_sites        ${homepage}
 
-checksums           rmd160  a22658e9ce855718b2d3dfcf69bd980130f54c6a \
-                    sha256  6d647f4c17282994cefb37e068cfb571cf9de14a22087701c59ff8c78a4e0b9d
+checksums           rmd160  de98039d80174a5da6e3cdbcc8b7bc0f4407e44a \
+                    sha256  8d1d040b8de1f65f01bc0a56053a6df7677360031bf9a6779d3496ced4a61186
 
 depends_lib         port:xapian-core \
                     port:qt4-mac \
@@ -34,10 +34,7 @@ depends_run         port:antiword \
                     port:unrtf \
                     port:unzip
 
-patchfiles         patch-configure.diff	\
-                   patch-recollinstall.diff \
-                   patch-qtgui-rclmain.diff	\
-                   patch-sampleconf-mimeview.diff
+patchfiles          patch-sampleconf-mimeview.diff
 
 configure.args      --without-x \
                     --disable-x11mon
diff --git a/src/rcldb/searchdata.cpp b/src/rcldb/searchdata.cpp
index dfc7c4d9..3b8ebcd9 100644
--- a/src/rcldb/searchdata.cpp
+++ b/src/rcldb/searchdata.cpp
@@ -1048,6 +1048,8 @@ bool SearchDataClausePath::toNativeQuery(Rcl::Db &db, void *p)
 
     if (m_text[0] == '/')
 	orqueries.push_back(Xapian::Query(wrap_prefix(pathelt_prefix)));
+    else
+        m_text = path_tildexpand(m_text);
 
     vector<string> vpath;
     stringToTokens(m_text, vpath, "/");