Attachment 109880 Details for Bug 150939 – file.diff

[patch] file.diff

file.diff (text/plain), 3.75 KB, created by Jean-Francois Dockes on 2010-09-25 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Francois Dockes

Created: 2010-09-25 16:40:01 UTC

Size: 3.75 KB

patch

obsolete

>diff -ruN recoll.prev/distinfo recoll/distinfo
>--- recoll.prev/distinfo	2010-05-04 22:16:09.000000000 +0200
>+++ recoll/distinfo	2010-09-25 14:39:38.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (recoll-1.13.04.tar.gz) = eba9d639dbac149996a92b9b2dffc5ee
>-SHA256 (recoll-1.13.04.tar.gz) =
>22a12df9595bfd3e42452c806e0b8ddd4e2425c748141a74af44f8bc33be493b
>-SIZE (recoll-1.13.04.tar.gz) = 1209507
>+MD5 (recoll-1.14.2.tar.gz) = 6130d2c6c9d82ef7e2f01f4441b7abc5
>+SHA256 (recoll-1.14.2.tar.gz) =
>064932fb359760fb757ef72f04e1c6b54bf4990e2e0331b8babe97251ad32eb2
>+SIZE (recoll-1.14.2.tar.gz) = 1285595
>diff -ruN recoll.prev/files/patch-configure recoll/files/patch-configure
>--- recoll.prev/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ recoll/files/patch-configure	2010-09-25 16:18:14.000000000 +0200
>@@ -0,0 +1,24 @@
>+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
>name with args.
>+ 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
>program. Maybe you need to install
>diff -ruN recoll.prev/files/patch-xapian12 recoll/files/patch-xapian12
>--- recoll.prev/files/patch-xapian12	2010-09-14 05:42:05.000000000 +0200
>+++ recoll/files/patch-xapian12	1970-01-01 01:00:00.000000000 +0100
>@@ -1,35 +0,0 @@
>-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"
>diff -ruN recoll.prev/pkg-plist recoll/pkg-plist
>--- recoll.prev/pkg-plist	2010-05-04 22:16:09.000000000 +0200
>+++ recoll/pkg-plist	2010-09-25 14:39:38.000000000 +0200
>@@ -12,11 +12,14 @@
> %%DATADIR%%/examples/rclmon.sh
> %%DATADIR%%/examples/recoll.conf
> %%DATADIR%%/filters/rclabw
>+%%DATADIR%%/filters/rclaptosidman
>+%%DATADIR%%/filters/rclaudio
> %%DATADIR%%/filters/rclchm
> %%DATADIR%%/filters/rcldjvu
> %%DATADIR%%/filters/rcldoc
> %%DATADIR%%/filters/rcldvi
> %%DATADIR%%/filters/rclexecm.py
>+%%DATADIR%%/filters/rclfb2
> %%DATADIR%%/filters/rclflac
> %%DATADIR%%/filters/rclgaim
> %%DATADIR%%/filters/rclics
>@@ -25,6 +28,7 @@
> %%DATADIR%%/filters/rclkwd
> %%DATADIR%%/filters/rcllyx
> %%DATADIR%%/filters/rclman
>+%%DATADIR%%/filters/rclnull
> %%DATADIR%%/filters/rclogg
> %%DATADIR%%/filters/rclopxml
> %%DATADIR%%/filters/rclpdf
>@@ -44,6 +48,7 @@
> %%DATADIR%%/filters/rclxls
> %%DATADIR%%/filters/rclzip
> %%DATADIR%%/filters/xdg-open
>+%%DATADIR%%/images/aptosid-manual.png
> %%DATADIR%%/images/document.png
> %%DATADIR%%/images/drawing.png
> %%DATADIR%%/images/folder.png

Actions: View | Diff

Attachments on bug 150939: 109879 | 109880