diff --git a/.gitignore b/.gitignore index b6bbece..833ddf8 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ recoll-1.13.04.tar.gz /recoll-1.28.6.tar.gz /recoll-1.29.1.tar.gz /recoll-1.29.2.tar.gz +/recoll-1.30.0.tar.gz diff --git a/0001-Dont-use-subscript.patch b/0001-Dont-use-subscript.patch deleted file mode 100644 index 6568aa4..0000000 --- a/0001-Dont-use-subscript.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7e43d991f316b82cb14f54e07238a8abc3840a0d Mon Sep 17 00:00:00 2001 -From: Terje Rosten -Date: Tue, 12 May 2020 20:28:53 +0200 -Subject: [PATCH] Dont use subscript if not subscriptable e.g. NoneType - ---- - filters/rclpython | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/filters/rclpython.py b/filters/rclpython.py -index b2d422a..ce2a5bd 100755 ---- a/filters/rclpython.py -+++ b/filters/rclpython.py -@@ -146,8 +146,11 @@ class Parser: - for a,b,c,d,e in tokenize.tokenize(text.readline): - self(a,b,c,d,e) - except tokenize.TokenError as ex: -- msg = ex[0] -- line = ex[1][0] -+ if hasattr(ex, '__getitem__'): -+ msg = ex[0] -+ line = ex[1][0] -+ else: -+ msg, line = repr(ex), repr(ex) - self.out.write(("

ERROR: %s

%s\n" % ( - msg, self.raw[self.lines[line]:])).encode('utf-8')) - except IndentationError as ex: --- -2.25.4 - diff --git a/recoll-1.30.0-no-gui-dep-in-kio.patch b/recoll-1.30.0-no-gui-dep-in-kio.patch new file mode 100644 index 0000000..76414f3 --- /dev/null +++ b/recoll-1.30.0-no-gui-dep-in-kio.patch @@ -0,0 +1,41 @@ +--- a/qtgui/guiutils.cpp ++++ b/qtgui/guiutils.cpp +@@ -30,7 +30,9 @@ + + #include + #include ++#ifdef BUILDING_RECOLLGUI + #include ++#endif + + RclDynConf *g_dynconf; + AdvSearchHist *g_advshistory; +@@ -200,9 +202,15 @@ void rwSettings(bool writing) + + SETTING_RW(prefs.reslistfontfamily, "/Recoll/prefs/reslist/fontFamily", + String, ""); +- SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Int, +- QFont().pointSize()); + ++ // While building the kio, we don't really care about QT Gui ++ // defaults and referencing QFont introduces a useless dependency ++#ifdef BUILDING_RECOLLGUI ++ SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Int, QFont().pointSize()); ++#else ++ SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Int, 12); ++#endif ++ + QString rlfDflt = QString::fromUtf8(prefs.dfltResListFormat); + if (writing) { + if (prefs.reslistformat.compare(rlfDflt)) { +--- a/qtgui/recoll.pro.in ++++ b/qtgui/recoll.pro.in +@@ -3,6 +3,7 @@ LANGUAGE = C++ + + VPATH = @srcdir@ + DEFINES += BUILDING_RECOLL ++DEFINES += BUILDING_RECOLLGUI + + @QMAKE_ENABLE_WEBKIT@ QT += webkit + @QMAKE_ENABLE_WEBKIT@ DEFINES += USING_WEBKIT + diff --git a/recoll.spec b/recoll.spec index b130a65..97d879f 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.29.2 +Version: 1.30.0 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -11,7 +11,7 @@ Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gs Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch Patch02: recoll-1.25.20-py3-only.patch -Patch03: 0001-Dont-use-subscript.patch +Patch03: recoll-1.30.0-no-gui-dep-in-kio.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -167,6 +167,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Apr 03 2021 Terje Rosten - 1.30.0-1 +- 1.30.0 + * Sun Mar 14 2021 Terje Rosten - 1.29.2-1 - 1.29.2 diff --git a/sources b/sources index 9237d44..8403d7c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.29.2.tar.gz) = c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5 +SHA512 (recoll-1.30.0.tar.gz) = 1377e155827a587857e4cfa712a37885a48518a42d57079d8f89ed715bc00f1ee453d58fb02cf7d21ecea359f3fa4278106f5c24bd52f2833c14df8dd1863d61 SHA512 (gssp-recoll-1.1.0.tar.gz) = 2b6240bc4b7e88df3feeb0d247eaec10008cbb4442d379e0c28ff1ce753273223a8dc450f8d24184bfb64200edaea7e3914d93e07816e3e415f7a5bb166c9671