From 2e6f18841e52e003fe4ffbf5908da99c98b2ed7b Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 28 Dec 2020 15:19:04 +0100 Subject: [PATCH] Fix KIO build for older versions --- packaging/debian/buildppa.sh | 2 +- .../patches/kio-has-uds-fastInsert.patch | 22 +++++++++++++++++++ packaging/debian/debiankio/patches/series | 1 + src/kde/kioslave/kio_recoll/dirif.cpp | 5 +++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 packaging/debian/debiankio/patches/kio-has-uds-fastInsert.patch diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 8c0064d1..0305772c 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -15,7 +15,7 @@ PPA_KEYID=7808CE96D38B9201 RCLVERS=1.28.1 SCOPEVERS=1.20.2.4 GSSPVERS=1.1.0 -PPAVERS=1 +PPAVERS=2 # RCLSRC=/y/home/dockes/projets/fulltext/recoll/src diff --git a/packaging/debian/debiankio/patches/kio-has-uds-fastInsert.patch b/packaging/debian/debiankio/patches/kio-has-uds-fastInsert.patch new file mode 100644 index 00000000..28a74b39 --- /dev/null +++ b/packaging/debian/debiankio/patches/kio-has-uds-fastInsert.patch @@ -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 + #include + #include ++#include + + #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 diff --git a/packaging/debian/debiankio/patches/series b/packaging/debian/debiankio/patches/series index e69de29b..bdceda35 100644 --- a/packaging/debian/debiankio/patches/series +++ b/packaging/debian/debiankio/patches/series @@ -0,0 +1 @@ +kio-has-uds-fastInsert.patch diff --git a/src/kde/kioslave/kio_recoll/dirif.cpp b/src/kde/kioslave/kio_recoll/dirif.cpp index b1f38fb4..4438a1e7 100644 --- a/src/kde/kioslave/kio_recoll/dirif.cpp +++ b/src/kde/kioslave/kio_recoll/dirif.cpp @@ -35,12 +35,17 @@ #include #include #include +#include #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