partially repaired debian kioslave build. Does not work on trusty any more because the recoll code needs -std=c++11

src/Makefile.am

@@ -274,7 +274,7 @@ librecoll_la_LIBADD = $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS)
 PicStatic: $(librecoll_la_OBJECTS)
 	rm -f .libs/librecoll.a
 	rm -f .libs/librecoll.so
-	libtool --tag=LD --mode=link gcc -g -O -o librecoll.la \
+	$(LIBTOOL) --tag=LD --mode=link gcc -g -O -o librecoll.la \
 		$(librecoll_la_OBJECTS)
 
 bin_PROGRAMS = recollindex

src/kde/kioslave/kio_recoll/CMakeLists.txt

@@ -74,7 +74,7 @@ ${rcltop}/qtgui/guiutils.cpp)
 add_library(kio_recoll MODULE ${kio_recoll_SRCS})
 
 add_custom_target(rcllib
-                 COMMAND make -j 6 PicStatic
+                 COMMAND make -j 3 PicStatic
                  WORKING_DIRECTORY ${rcltop}
 )
 add_dependencies(kio_recoll rcllib)

src/kde/kioslave/kio_recoll/dirif.cpp

@@ -305,7 +305,8 @@ void RecollProtocol::listDir(const QUrl& url)
         // which offers an opportunity to not perform it.
         if (ingest.endSlashQuery()) {
             qDebug() << "RecollProtocol::listDir: Ends With /";
-            error(ERR_SLAVE_DEFINED, u8s2qs("Autocompletion search aborted"));
+            error(ERR_SLAVE_DEFINED,
+                  QString::fromUtf8("Autocompletion search aborted"));
             return;
         }
         if (!syncSearch(qd)) {
@@ -335,7 +336,7 @@ void RecollProtocol::listDir(const QUrl& url)
         int pagelen = m_source->getSeqSlice(pagebase, pagesize, page);
         UDSEntry entry;
         if (pagelen < 0) {
-            error(ERR_SLAVE_DEFINED, u8s2qs("Internal error"));
+            error(ERR_SLAVE_DEFINED, QString::fromUtf8("Internal error"));
             break;
         }
         UDSEntryList entries;

src/kde/kioslave/kio_recoll/htmlif.cpp

@@ -240,7 +240,7 @@ void RecollProtocol::showPreview(const Rcl::Doc& idoc)
     string ipath = idoc.ipath;
     if (!interner.internfile(fdoc, ipath)) {
         error(KIO::ERR_SLAVE_DEFINED,
-              u8s2qs("Cannot convert file to internal format"));
+              QString::fromUtf8("Cannot convert file to internal format"));
         return;
     }
     if (!interner.get_html().empty()) {