Date: Mon, 30 Aug 2010 23:05:53 +0200 From: Jean-Francois Dockes <jf@dockes.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/150131: [PATCH] deskutils/recoll: fix compilation issue for xapian 1.2 Message-ID: <AANLkTimgrPmopY6GbW5knBtRY3NWnZ5Rxb61NaDqMFki@mail.gmail.com> Resent-Message-ID: <201008302130.o7ULU7a0016922@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150131
>Category: ports
>Synopsis: [PATCH] deskutils/recoll: fix compilation issue for xapian 1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 30 21:30:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Jean-Francois Dockes
>Release: FreeBSD 7.3-STABLE amd64
>Organization:
>Environment:
System: FreeBSD y 7.3-STABLE FreeBSD 7.3-STABLE #3: Fri Jul 23
10:11:13 CEST 2010 dockes@y:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Recoll would not compile with Xapian 1.2. The patch brings compatibility
with xapian 1.2 (and keeps it ok with 1.0)
>How-To-Repeat:
>Fix:
diff -ruN recoll.prev/Makefile recoll/Makefile
--- recoll.prev/Makefile 2010-05-04 22:16:09.000000000 +0200
+++ recoll/Makefile 2010-08-30 19:58:52.000000000 +0200
@@ -10,7 +10,7 @@
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 -ruN recoll.prev/files/patch-xapian12 recoll/files/patch-xapian12
--- recoll.prev/files/patch-xapian12 1970-01-01 01:00:00.000000000 +0100
+++ recoll/files/patch-xapian12 2010-08-30 19:55:10.000000000 +0200
@@ -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"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTimgrPmopY6GbW5knBtRY3NWnZ5Rxb61NaDqMFki>