Attachment #109880 for bug #150939

Lines 1-3 Link Here

(-)recoll/distinfo (-3 / +3 lines)
1	MD5 (recoll-1.13.04.tar.gz) = eba9d639dbac149996a92b9b2dffc5ee
2	SHA256 (recoll-1.13.04.tar.gz) =
Line 23 Link Here
23	SIZE (recoll-1.13.04.tar.gz) = 1209507	12	MD5 (recoll-1.14.2.tar.gz) = 6130d2c6c9d82ef7e2f01f4441b7abc5
		13	SHA256 (recoll-1.14.2.tar.gz) =
		14	SIZE (recoll-1.14.2.tar.gz) = 1285595




diff -r 3ff2556caa01 src/configure
--- configure	Sat Sep 25 08:32:10 2010 +0200
+++ configure	Sat Sep 25 16:16:33 2010 +0200
@@ -5159,8 +5159,9 @@
   if test X$QMAKE = X ; then
      QMAKE=qmake
   fi
-
-  # Extract the first word of "$QMAKE", so it can be a program name with args.
+  case $QMAKE in
+    */*) QMAKEPATH=$QMAKE;;
+    *) # Extract the first word of "$QMAKE", so it can be a program
 set dummy $QMAKE; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -5200,6 +5201,8 @@
 $as_echo "no" >&6; }
 fi

+;;
+  esac

   if test X$QMAKEPATH = XNOTFOUND ; then
      { { $as_echo "$as_me:$LINENO: error: Cannot find the qmake




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"

Lines 12-22 Link Here

(-)recoll/pkg-plist (+5 lines)
12	%%DATADIR%%/examples/rclmon.sh	12	%%DATADIR%%/examples/rclmon.sh
13	%%DATADIR%%/examples/recoll.conf	13	%%DATADIR%%/examples/recoll.conf
14	%%DATADIR%%/filters/rclabw	14	%%DATADIR%%/filters/rclabw
		15	%%DATADIR%%/filters/rclaptosidman
		16	%%DATADIR%%/filters/rclaudio
15	%%DATADIR%%/filters/rclchm	17	%%DATADIR%%/filters/rclchm
16	%%DATADIR%%/filters/rcldjvu	18	%%DATADIR%%/filters/rcldjvu
17	%%DATADIR%%/filters/rcldoc	19	%%DATADIR%%/filters/rcldoc
18	%%DATADIR%%/filters/rcldvi	20	%%DATADIR%%/filters/rcldvi
19	%%DATADIR%%/filters/rclexecm.py	21	%%DATADIR%%/filters/rclexecm.py
		22	%%DATADIR%%/filters/rclfb2
20	%%DATADIR%%/filters/rclflac	23	%%DATADIR%%/filters/rclflac
21	%%DATADIR%%/filters/rclgaim	24	%%DATADIR%%/filters/rclgaim
22	%%DATADIR%%/filters/rclics	25	%%DATADIR%%/filters/rclics
Lines 25-30 Link Here
25	%%DATADIR%%/filters/rclkwd	28	%%DATADIR%%/filters/rclkwd
26	%%DATADIR%%/filters/rcllyx	29	%%DATADIR%%/filters/rcllyx
27	%%DATADIR%%/filters/rclman	30	%%DATADIR%%/filters/rclman
		31	%%DATADIR%%/filters/rclnull
28	%%DATADIR%%/filters/rclogg	32	%%DATADIR%%/filters/rclogg
29	%%DATADIR%%/filters/rclopxml	33	%%DATADIR%%/filters/rclopxml
30	%%DATADIR%%/filters/rclpdf	34	%%DATADIR%%/filters/rclpdf
Lines 44-49 Link Here
44	%%DATADIR%%/filters/rclxls	48	%%DATADIR%%/filters/rclxls
45	%%DATADIR%%/filters/rclzip	49	%%DATADIR%%/filters/rclzip
46	%%DATADIR%%/filters/xdg-open	50	%%DATADIR%%/filters/xdg-open
		51	%%DATADIR%%/images/aptosid-manual.png
47	%%DATADIR%%/images/document.png	52	%%DATADIR%%/images/document.png
48	%%DATADIR%%/images/drawing.png	53	%%DATADIR%%/images/drawing.png
49	%%DATADIR%%/images/folder.png	54	%%DATADIR%%/images/folder.png

Return to bug 150939

Line 0 Link Here

(-)recoll/files/patch-configure (+24 lines)
	1	diff -r 3ff2556caa01 src/configure
	2	--- configure Sat Sep 25 08:32:10 2010 +0200
	3	+++ configure Sat Sep 25 16:16:33 2010 +0200
	4	@@ -5159,8 +5159,9 @@
	5	if test X$QMAKE = X ; then
	6	QMAKE=qmake
	7	fi
	8	-
	9	- # Extract the first word of "$QMAKE", so it can be a program name with args.
	10	+ case $QMAKE in
	11	+ /) QMAKEPATH=$QMAKE;;
	12	+ *) # Extract the first word of "$QMAKE", so it can be a program
	13	set dummy $QMAKE; ac_word=$2
	14	{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
	15	$as_echo_n "checking for $ac_word... " >&6; }
	16	@@ -5200,6 +5201,8 @@
	17	$as_echo "no" >&6; }
	18	fi
	19
	20	+;;
	21	+ esac
	22
	23	if test X$QMAKEPATH = XNOTFOUND ; then
	24	{ { $as_echo "$as_me:$LINENO: error: Cannot find the qmake

Lines 1-35 Link Here

(-)recoll/files/patch-xapian12 (-35 lines)
1	diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rcldb.cpp
2	--- rcldb/rcldb.cpp Tue May 04 15:40:13 2010 +0200
3	+++ rcldb/rcldb.cpp Tue May 04 15:40:40 2010 +0200
4	@@ -33,7 +33,7 @@
5	using namespace std;
6	#endif /* NO_NAMESPACES */
7
8	-#include "xapian/version.h"
9	+#include "xapian.h"
10
11	#include "rclconfig.h"
12	#include "rcldb.h"
13	diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rclquery.cpp
14	--- rcldb/rclquery.cpp Tue May 04 15:40:13 2010 +0200
15	+++ rcldb/rclquery.cpp Tue May 04 15:40:40 2010 +0200
16	@@ -8,7 +8,7 @@
17	#include <list>
18	#include <vector>
19
20	-#include "xapian/sorter.h"
21	+#include "xapian.h"
22
23	#include "rcldb.h"
24	#include "rcldb_p.h"
25	diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/stemdb.cpp
26	--- rcldb/stemdb.cpp Tue May 04 15:40:13 2010 +0200
27	+++ rcldb/stemdb.cpp Tue May 04 15:40:40 2010 +0200
28	@@ -12,7 +12,6 @@
29	#include <map>
30
31	#include <xapian.h>
32	-#include <xapian/stem.h>
33
34	#include "stemdb.h"
35	#include "wipedir.h"