From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 30 21:30:07 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A551310656BF for ; Mon, 30 Aug 2010 21:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 67E278FC0C for ; Mon, 30 Aug 2010 21:30:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o7ULU7To016929 for ; Mon, 30 Aug 2010 21:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7ULU7a0016922; Mon, 30 Aug 2010 21:30:07 GMT (envelope-from gnats) Resent-Date: Mon, 30 Aug 2010 21:30:07 GMT Resent-Message-Id: <201008302130.o7ULU7a0016922@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jean-Francois Dockes Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B367010656BB for ; Mon, 30 Aug 2010 21:27:49 +0000 (UTC) (envelope-from jfdockes@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4B0D78FC0A for ; Mon, 30 Aug 2010 21:27:45 +0000 (UTC) Received: by wyb33 with SMTP id 33so8256143wyb.13 for ; Mon, 30 Aug 2010 14:27:44 -0700 (PDT) Received: by 10.216.10.5 with SMTP id 5mr5446223weu.81.1283202353348; Mon, 30 Aug 2010 14:05:53 -0700 (PDT) Received: by 10.216.52.139 with HTTP; Mon, 30 Aug 2010 14:05:53 -0700 (PDT) Message-Id: Date: Mon, 30 Aug 2010 23:05:53 +0200 From: Jean-Francois Dockes Sender: jfdockes@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/150131: [PATCH] deskutils/recoll: fix compilation issue for xapian 1.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2010 21:30:07 -0000 >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 + #include + +-#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 + + #include +-#include + + #include "stemdb.h" + #include "wipedir.h" >Release-Note: >Audit-Trail: >Unformatted: