From 01d55fd35f2847bd453568bc5db2c7532907fbff Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 7 Apr 2015 09:03:03 +0200
Subject: [PATCH] 7zip filter: minimum docs and test

---
 tests/7zip/7zip.sh           | 16 ++++++++++++++++
 tests/7zip/7zip.txt          |  2 ++
 website/download.html        |  8 ++++++--
 website/features.html        |  8 ++++++++
 website/filters/filters.html |  6 ++++++
 website/index.html.en        |  7 +++++++
 website/index.html.fr        |  5 +++++
 website/release-1.20.html    | 12 +++++++-----
 8 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100755 tests/7zip/7zip.sh
 create mode 100644 tests/7zip/7zip.txt

diff --git a/tests/7zip/7zip.sh b/tests/7zip/7zip.sh
new file mode 100755
index 00000000..ab20a058
--- /dev/null
+++ b/tests/7zip/7zip.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+(
+  recollq '7zr_unique'
+
+)  2> $mystderr | egrep -v '^Recoll query: ' > $mystdout
+
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/7zip/7zip.txt b/tests/7zip/7zip.txt
new file mode 100644
index 00000000..2738af43
--- /dev/null
+++ b/tests/7zip/7zip.txt
@@ -0,0 +1,2 @@
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/7z/7zarchive.7z]	[7zarchive.7z]	11	bytes	
diff --git a/website/download.html b/website/download.html
index b5fa3436..1da06d43 100644
--- a/website/download.html
+++ b/website/download.html
@@ -68,7 +68,7 @@ function showdiv(viewid)
 <h2><a name="general">General information</a></h2>
 
 <p>The current version is 1.20.4. <a href="release-1.20.html">Release
-notes</a>.</p>
+    notes</a>.</p>
 
 <p>The download page for Recoll 1.19 is <a href="download-1.19.html">still
 available</a>.</p>
@@ -122,7 +122,11 @@ is probably no necessity to upgrade anyway.</p>
 subdirectory, because of all the places they're referred from
 (package watches) -->
 
-<p><a href="recoll-1.20.4.tar.gz">recoll-1.20.4.tar.gz</a>. </p>
+<p><a href="recoll-1.20.4.tar.gz">recoll-1.20.4.tar.gz</a>.</p>
+
+<p>If you want to run with Qt 5 (5.3), you can
+try <a href="recoll-1.20.5.tar.gz">recoll-1.20.5.tar.gz</a>. No
+changes, except for Qt 5 (5.3.2) compatibility tweaks.</p>
 
 <!--
 <h3>Snapshot</h3>
diff --git a/website/features.html b/website/features.html
index 77d537fa..315c1a2f 100644
--- a/website/features.html
+++ b/website/features.html
@@ -229,6 +229,14 @@ application/x-tar = execm rcltar
         module and the <a
         href="http://www.rarlab.com/rar_add.htm">unrar</a> utility.</li>
 
+        <li><span class="application">7zip</span> archives (needs 
+          <span class="command">Python</span> and  
+          the <a href="https://pypi.python.org/pypi/pylzma">pylzma
+            module</a>). This is a recent addition, and you need to
+            download the filter from
+          the <a href="filters/filters.html">filters pages</a> for
+          all Recoll versions prior to 1.21.</li>
+
         <li><span class="application">iCalendar</span>(.ics) files
         (needs <span class="command">Python, <a href=
         "http://pypi.python.org/pypi/icalendar/2.1">icalendar</a></span>).</li>
diff --git a/website/filters/filters.html b/website/filters/filters.html
index ddd97e07..6dc97146 100644
--- a/website/filters/filters.html
+++ b/website/filters/filters.html
@@ -76,6 +76,12 @@
       <p>However, if you are running a Recoll version older than 1.17,
         you should really upgrade.</p>
 
+      <h2>7zip archives</h2>
+      <p>A new <a href="rcl7z">rcl7z</a> filter by François Botha
+        for 7zip archives. Needs the 
+        <a href="https://pypi.python.org/pypi/pylzma">pylzma Python
+        module</a>. </p> 
+
       <h2>Attachments to PDF documents (1.20 and older)</h2>
 
       <p>A new <a href="rclmpdf">rclmpdf</a> filter for processing
diff --git a/website/index.html.en b/website/index.html.en
index 22d116d1..88ecef56 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -98,6 +98,13 @@
 
       
       <dl>
+
+        <dt>2015-04-05</dt>
+        <dd>Recoll now builds and runs with Qt 5 (5.3.2 ok, 5.2 not so
+          much). Released 1.20.5, which is exactly 1.20.4 with Qt 5
+          tweaks, and still compatible with Qt 4 of course (no reason
+          to upgrade if you are using Qt 4).</dd>
+
         <dt>2015-03-30</dt> 
         <dd>Recoll 1.20.4 released. This fixes real time indexing of
           the web history (when using the Firefox plugin).</dd>
diff --git a/website/index.html.fr b/website/index.html.fr
index bf8bd731..1cc127bf 100644
--- a/website/index.html.fr
+++ b/website/index.html.fr
@@ -106,6 +106,11 @@
       <h2>Nouvelles: </h2>
       <dl>
 
+        <dt>2015-04-05</dt>
+        <dd>Recoll 1.20.5 est identique à 1.20.4, à quelques
+          modifications de compatibilité Qt 5 près. Testé avec Qt
+          5.3.2, ne fonctionne pas avec Qt 5.2.</dd>
+
         <dt>2015-03-30</dt> 
         <dd>1.20.4. Corrige l'indexation au fil de l'eau de
           l'historique web (en utilisation avec le plugin Firefox).</dd>
diff --git a/website/release-1.20.html b/website/release-1.20.html
index 3fa562e1..2bd0edd3 100644
--- a/website/release-1.20.html
+++ b/website/release-1.20.html
@@ -59,11 +59,13 @@
 	  <h2><a name="minor_releases">Minor releases at a glance</a></h2>
 
 	  <ul>
-		<li>1.20.4 has a fix to skip compress file system images
-		  like xxx.img.gz by default. This should have been in 1.20.3</li>
-        <li>1.20.3 has a very minor change to copy the Query
-          Fragments Window config file from the default if it does
-          not exist in the user config dir.</li>
+            <li>1.20.5 is 1.20.4 with a few Qt 5 compatibility
+              tweaks. Builds and runs with Qt 5.3.2, fails with 5.2.</li>
+	    <li>1.20.4 has a fix to skip compress file system images
+	      like xxx.img.gz by default. This should have been in 1.20.3</li>
+            <li>1.20.3 has a very minor change to copy the Query
+              Fragments Window config file from the default if it does
+              not exist in the user config dir.</li>
 	    <li>1.20.2 fixes a bug which prevented the real time indexer
 	      from indexing the web history queue (this was still processed
 	      when starting up). It also adds systray capability to