perform tilde expansion for dir: clauses. Closes issue #177

This commit is contained in:
Jean-Francois Dockes 2014-03-10 10:14:04 +01:00
parent 5676f020ca
commit 303321e568
3 changed files with 26 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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, "/");