summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-09-14 03:42:05 +0000
committerPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-09-14 03:42:05 +0000
commit429e71ecb2caf1351f1558da5f90bb2f606584f0 (patch)
tree8d1c37ba4d64e0b9905c4f328fabdf391cb742d9 /deskutils
parent- Bring in commit r665 from upstream which fixes a (diff)
- Support both Xapian 1.0 and 1.2
PR: ports/150131 Submitted by: Jean-Francois Dockes <jf@dockes.org> (maintainer)
Notes
Notes: svn path=/head/; revision=261119
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/recoll/Makefile2
-rw-r--r--deskutils/recoll/files/patch-xapian1235
2 files changed, 36 insertions, 1 deletions
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 5246c5728967..968e05dadbcd 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.13.04
CATEGORIES= deskutils
MASTER_SITES= http://www.lesbonscomptes.com/recoll/
-MAINTAINER= jean-francois.dockes@wanadoo.fr
+MAINTAINER= jf@dockes.org
COMMENT= A personal full text search package, based on QT and Xapian
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
diff --git a/deskutils/recoll/files/patch-xapian12 b/deskutils/recoll/files/patch-xapian12
new file mode 100644
index 000000000000..a1f5c48fa27a
--- /dev/null
+++ b/deskutils/recoll/files/patch-xapian12
@@ -0,0 +1,35 @@
+diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rcldb.cpp
+--- rcldb/rcldb.cpp Tue May 04 15:40:13 2010 +0200
++++ rcldb/rcldb.cpp Tue May 04 15:40:40 2010 +0200
+@@ -33,7 +33,7 @@
+ using namespace std;
+ #endif /* NO_NAMESPACES */
+
+-#include "xapian/version.h"
++#include "xapian.h"
+
+ #include "rclconfig.h"
+ #include "rcldb.h"
+diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rclquery.cpp
+--- rcldb/rclquery.cpp Tue May 04 15:40:13 2010 +0200
++++ rcldb/rclquery.cpp Tue May 04 15:40:40 2010 +0200
+@@ -8,7 +8,7 @@
+ #include <list>
+ #include <vector>
+
+-#include "xapian/sorter.h"
++#include "xapian.h"
+
+ #include "rcldb.h"
+ #include "rcldb_p.h"
+diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/stemdb.cpp
+--- rcldb/stemdb.cpp Tue May 04 15:40:13 2010 +0200
++++ rcldb/stemdb.cpp Tue May 04 15:40:40 2010 +0200
+@@ -12,7 +12,6 @@
+ #include <map>
+
+ #include <xapian.h>
+-#include <xapian/stem.h>
+
+ #include "stemdb.h"
+ #include "wipedir.h"