Fix kio build for newer ubuntu releases and recoll 1.25

2019-02-15 18:18:25 +01:00
parent 55a9d59dd6
commit 5b8e2d06e1
9 changed files with 126 additions and 24 deletions
@@ -1 +1 @@
-7
+9
@@ -10,9 +10,10 @@ Build-Depends: cdbs,
               kdelibs5-dev (>= 4:4.2.2),
               qtbase5-dev,
               extra-cmake-modules,
-               kio-dev,
+               libkf5kio-dev,
               pkg-kde-tools (>= 0.4.0), 
               libxapian-dev, 
+               libxslt1-dev,
               libz-dev
 Standards-Version: 3.9.7
 Homepage: http://www.recoll.org/
@@ -0,0 +1,37 @@
+Source: kio-recoll
+Section: kde
+Priority: extra
+Maintainer: Jean-Francois Dockes <jfd@recoll.org>
+Build-Depends: cdbs, 
+               cmake,
+               libtool,
+               debhelper (>= 7), 
+               bison,
+               kdelibs5-dev (>= 4:4.2.2),
+               qtbase5-dev,
+               extra-cmake-modules,
+               kio-dev,
+               pkg-kde-tools (>= 0.4.0), 
+               libxapian-dev, 
+               libxslt1-dev,
+               libz-dev
+Standards-Version: 3.9.7
+Homepage: http://www.recoll.org/
+
+Package: kio-recoll
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
+Description: Recoll KIO slave for KDE 4
+ Recoll KIO slave for KDE 4, allows performing a Recoll search by
+ entering an appropriate URL in a KDE open dialog, or with an HTML-based
+ interface displayed in Konqueror.  
+ The HTML-based interface is similar to the Recoll GUI QT-based interface,
+ slightly less powerful. It allows performing a search while staying fully
+ within the KDE framework: drag and drop from the result list works
+ normally and you have your normal choice of applications for opening files. 
+ An alternative interface uses a directory view of search results. Due to
+ limitations in the current KIO slave interface, it is currently not
+ obviously useful.
+ The interface is described in more detail inside a help file which you can
+ access by entering recoll:/ inside the konqueror URL line (this works only
+ if the recoll KIO slave has been previously installed). 
@@ -0,0 +1,37 @@
+Source: kio-recoll
+Section: kde
+Priority: extra
+Maintainer: Jean-Francois Dockes <jfd@recoll.org>
+Build-Depends: cdbs, 
+               cmake,
+               libtool,
+               debhelper (>= 7), 
+               bison,
+               kdelibs5-dev (>= 4:4.2.2),
+               qtbase5-dev,
+               extra-cmake-modules,
+               kio-dev,
+               pkg-kde-tools (>= 0.4.0), 
+               libxapian-dev, 
+               libxslt1-dev,
+               libz-dev
+Standards-Version: 3.9.7
+Homepage: http://www.recoll.org/
+
+Package: kio-recoll
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
+Description: Recoll KIO slave for KDE 4
+ Recoll KIO slave for KDE 4, allows performing a Recoll search by
+ entering an appropriate URL in a KDE open dialog, or with an HTML-based
+ interface displayed in Konqueror.  
+ The HTML-based interface is similar to the Recoll GUI QT-based interface,
+ slightly less powerful. It allows performing a search while staying fully
+ within the KDE framework: drag and drop from the result list works
+ normally and you have your normal choice of applications for opening files. 
+ An alternative interface uses a directory view of search results. Due to
+ limitations in the current KIO slave interface, it is currently not
+ obviously useful.
+ The interface is described in more detail inside a help file which you can
+ access by entering recoll:/ inside the konqueror URL line (this works only
+ if the recoll KIO slave has been previously installed). 
@@ -1,11 +0,0 @@
-diff -r 110af3426961 src/kde/kioslave/kio_recoll/CMakeLists.txt
--- a/kde/kioslave/kio_recoll/CMakeLists.txt	Mon May 15 13:18:53 2017 +0200
-+++ b/kde/kioslave/kio_recoll/CMakeLists.txt	Mon May 15 13:19:28 2017 +0200
-@@ -83,6 +83,7 @@
- recoll 
- xapian 
- KF5::KIOCore
-+dl
- z 
- pthread
- )
@@ -0,0 +1,29 @@
+diff --git a/kde/kioslave/kio_recoll/CMakeLists.txt b/kde/kioslave/kio_recoll/CMakeLists.txt
+index 0c2de973..277f1578 100644
+--- a/kde/kioslave/kio_recoll/CMakeLists.txt
+++ b/kde/kioslave/kio_recoll/CMakeLists.txt
+@@ -42,7 +42,7 @@ set(rcltop ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+ 
+ # Execute recoll configuration to create autoconfig.h and version.h and
+ # generate a PIC lib
+-execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
+execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --disable-python-chm --disable-python-module --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
+ 		WORKING_DIRECTORY ${rcltop}
+ )
+ 
+@@ -82,10 +82,12 @@ add_dependencies(kio_recoll rcllib)
+ target_link_libraries(kio_recoll
+ recoll 
+ xapian 
+-KF5::KIOCore
+-dl
+xslt
+xml2 
+KF5::KIOCore 
+dl 
+ z 
+-pthread
+pthread 
+ )
+ 
+ install(FILES recoll.protocol recollf.protocol 
@@ -0,0 +1 @@
+fix-kio-cmake-nopython+xml.patch