Fix KIO build for older versions

This commit is contained in:
Jean-Francois Dockes 2020-12-28 15:19:04 +01:00
parent 7fd0db14e8
commit 2e6f18841e
4 changed files with 29 additions and 1 deletions

View File

@ -15,7 +15,7 @@ PPA_KEYID=7808CE96D38B9201
RCLVERS=1.28.1 RCLVERS=1.28.1
SCOPEVERS=1.20.2.4 SCOPEVERS=1.20.2.4
GSSPVERS=1.1.0 GSSPVERS=1.1.0
PPAVERS=1 PPAVERS=2
# #
RCLSRC=/y/home/dockes/projets/fulltext/recoll/src RCLSRC=/y/home/dockes/projets/fulltext/recoll/src

View File

@ -0,0 +1,22 @@
diff --git a/kde/kioslave/kio_recoll/dirif.cpp b/kde/kioslave/kio_recoll/dirif.cpp
index b1f38fb4..4438a1e7 100644
--- a/kde/kioslave/kio_recoll/dirif.cpp
+++ b/kde/kioslave/kio_recoll/dirif.cpp
@@ -35,12 +35,17 @@
#include <QDebug>
#include <QUrl>
#include <QStandardPaths>
+#include <KF5/kio_version.h>
#include "kio_recoll.h"
#include "pathut.h"
using namespace KIO;
+#if KIO_VERSION < ((5<<16)|(49<<8)|(0))
+#define fastInsert insert
+#endif
+
static const QString resultBaseName("recollResult");
// Check if the input URL is of the form that konqueror builds by

View File

@ -0,0 +1 @@
kio-has-uds-fastInsert.patch

View File

@ -35,12 +35,17 @@
#include <QDebug> #include <QDebug>
#include <QUrl> #include <QUrl>
#include <QStandardPaths> #include <QStandardPaths>
#include <KF5/kio_version.h>
#include "kio_recoll.h" #include "kio_recoll.h"
#include "pathut.h" #include "pathut.h"
using namespace KIO; using namespace KIO;
#if KIO_VERSION < ((5<<16)|(49<<8)|(0))
#define fastInsert insert
#endif
static const QString resultBaseName("recollResult"); static const QString resultBaseName("recollResult");
// Check if the input URL is of the form that konqueror builds by // Check if the input URL is of the form that konqueror builds by