From 64d72a1b0b6328361c48b06c8ff211ca596150d3 Mon Sep 17 00:00:00 2001
From: Terje Røsten <terje.rosten@ntnu.no>
Date: Dec 03 2018 19:21:47 +0000
Subject: 1.24.3


---

diff --git a/.gitignore b/.gitignore
index d8044c5..e108d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ recoll-1.13.04.tar.gz
 /recoll-1.23.6.tar.gz
 /recoll-1.23.7.tar.gz
 /recoll-1.24.1.tar.gz
+/recoll-1.24.3.tar.gz
diff --git a/recoll-qt.patch b/recoll-qt.patch
deleted file mode 100644
index 1e9f906..0000000
--- a/recoll-qt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/qtgui/ssearch_w.cpp b/src/qtgui/ssearch_w.cpp
-index 145e7c2..894eebf 100644
---- a/src/qtgui/ssearch_w.cpp
-+++ b/src/qtgui/ssearch_w.cpp
-@@ -32,6 +32,7 @@
- #include <qevent.h>
- #include <QTimer>
- #include <QCompleter>
-+#include <QAbstractItemView>
- 
- #include "log.h"
- #include "guiutils.h"
-@@ -709,7 +710,7 @@ bool SSearch::eventFilter(QObject *target, QEvent *event)
-     LOGDEB2("SSearch::eventFilter: target "  << (target) << " ("  << (queryText->lineEdit()) << ") type "  << (eventTypeToStr(event->type())) << "\n" );
- #endif
- 
--    if (target == queryText->view()) {
-+    if (target == (QObject*)(queryText->view())) {
- 	if (event->type() == QEvent::Hide) {
- 	    // List was closed. If we were displaying completions, need
- 	    // to reset state.
-
diff --git a/recoll-utf8.patch b/recoll-utf8.patch
deleted file mode 100644
index ad39ae2..0000000
--- a/recoll-utf8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-@@ -, +, @@ 
-    GUI restable: make sure the URL column is UTF-8, else url-encode it for display
---- a/src/qtgui/restable.cpp	
-+++ a/src/qtgui/restable.cpp	
-@@ -362,19 +362,30 @@ QVariant RecollModel::data(const QModelIndex& index, int role) const
-     LOGDEB2("RecollModel::data: row " << index.row() << " col " <<
-             index.column() << " role " << role << "\n");
-     if (!m_source || role != Qt::DisplayRole || !index.isValid() ||
--	index.column() >= int(m_fields.size())) {
--	return QVariant();
-+        index.column() >= int(m_fields.size())) {
-+        return QVariant();
-     }
- 
-     Rcl::Doc doc;
-     if (!m_source->getDoc(index.row(), doc)) {
--	return QVariant();
-+        return QVariant();
-     }
- 
-     string colname = m_fields[index.column()];
- 
-+    string data = m_getters[index.column()](colname, doc);
-+
-+    // Special case url, because it may not be utf-8. URL-encode in this case.
-+    if (!colname.compare("url")) {
-+        int ecnt;
-+        string data1;
-+        if (!transcode(data, data1, "UTF-8", "UTF-8", &ecnt) || ecnt > 0) {
-+            data = url_encode(data);
-+        }
-+    }
-+
-     list<string> lr;
--    g_hiliter.plaintorich(m_getters[index.column()](colname, doc), lr, m_hdata);
-+    g_hiliter.plaintorich(data, lr, m_hdata);
-     return QString::fromUtf8(lr.front().c_str());
- }
- 
-
diff --git a/recoll.spec b/recoll.spec
index 8facab3..37edd72 100644
--- a/recoll.spec
+++ b/recoll.spec
@@ -3,15 +3,13 @@
 
 Summary:        Desktop full text search tool with Qt GUI
 Name:           recoll
-Version:        1.24.1
+Version:        1.24.3
 Release:        1%{?dist}
 License:        GPLv2+
 URL:            http://www.lesbonscomptes.com/recoll/
 Source0:        http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
 Source10:       qmake-qt5.sh
-Patch1:         recoll-qt.patch
-Patch2:         recoll-python.patch
-Patch3:         recoll-utf8.patch
+Patch1:         recoll-python.patch
 BuildRequires:  aspell-devel
 BuildRequires:  bison
 BuildRequires:  desktop-file-utils
@@ -45,9 +43,10 @@ displayed in Konqueror.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p2
-%patch2 -p1
-%patch3 -p2
+%patch1 -p1
+f="desktop/recoll-searchgui.desktop"
+iconv -f ISO_8859-1 -t utf-8 -o $f.utf8 $f
+mv $f.utf8 $f
 
 %build
 CFLAGS="%{optflags}"; export CFLAGS
@@ -174,6 +173,9 @@ exit 0
 %{_datadir}/kservices5/recollf.protocol
 
 %changelog
+* Mon Dec 03 2018 Terje Rosten <terje.rosten@ntnu.no> - 1.24.3-1
+- 1.24.3
+
 * Sat Sep 29 2018 Terje Rosten <terje.rosten@ntnu.no> - 1.24.1-1
 - 1.24.1
 
diff --git a/sources b/sources
index abf95dc..2501ca6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (recoll-1.24.1.tar.gz) = 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c
+SHA512 (recoll-1.24.3.tar.gz) = 1af7abb3063df4ac9f4f9290743f53fe91ebfc2147ddab9e8dc987eb2bb6ffa89a6605632d0a4cbe17576c3050c7d4535ae889ab93ed7d0c27b629a2f0f41995